diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-10 16:49:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-23 15:05:37 -0700 |
| commit | 4a2cb90c538f06c873a187aa743575d48685d7a6 (patch) | |
| tree | 579f79665704c620509f58110a055991e563561a /include | |
| parent | f8c003f782fd913969aa44648fd382d998587533 (diff) | |
Revert "x86, efi: Retain boot service code until after switching to virtual mode"
This reverts commit 0aed459e8487eb6ebdb4efe8cefe1eafbc704b30, which was
commit 916f676f8dc016103f983c7ec54c18ecdbb6e349 upstream.
It breaks some people's machines, so this will all get worked out in the
3.0 kernel release, it's not quite ready for 2.6.39 just yet.
Thanks to Maarten Lankhorst <m.b.lankhorst@gmail.com> for reporting the
issue.
Cc: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Cc: Jim Bos <jim876@xs4all.nl>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index e376270cd26e..33fa1203024e 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -299,7 +299,6 @@ extern void efi_initialize_iomem_resources(struct resource *code_resource, struct resource *data_resource, struct resource *bss_resource); extern unsigned long efi_get_time(void); extern int efi_set_rtc_mmss(unsigned long nowtime); -extern void efi_reserve_boot_services(void); extern struct efi_memory_map memmap; /** |