Commit-ID: f383a1e37bc3fc93d19ed23dfdb1adfc5a7d1010
Gitweb: http://git.kernel.org/tip/f383a1e37bc3fc93d19ed23dfdb1adfc5a7d1010
Author: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
AuthorDate: Sat, 8 Sep 2012 15:06:49 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Thu, 27 Sep 2012 14:43:32 -0700
efi: Add a stub for efi_enter_virtual_mode on non-x86
This eliminates an ifdef in init/main.c.
Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/993c7f2ee7d53cc480280653a7df500db0882342.1347141698.git.josh@xxxxxxxxxxxxxxxx
Acked-by: Matt Fleming <matt.fleming@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
include/linux/efi.h | 4 ++++
init/main.c | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/linux/efi.h b/include/linux/efi.h
index ec45ccd..52fbedf 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -495,7 +495,11 @@ extern void *efi_get_pal_addr (void);
extern void efi_map_pal_code (void);
extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
extern void efi_gettimeofday (struct timespec *ts);
+#ifdef CONFIG_X86
extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */
+#else
+static void efi_enter_virtual_mode(void) {}
+#endif
extern u64 efi_get_iobase (void);
extern u32 efi_mem_type (unsigned long phys_addr);
extern u64 efi_mem_attributes (unsigned long phys_addr);
diff --git a/init/main.c b/init/main.c
index b286730..ebb1ba5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -602,10 +602,8 @@ asmlinkage void __init start_kernel(void)
calibrate_delay();
pidmap_init();
anon_vma_init();
-#ifdef CONFIG_X86
if (efi_enabled)
efi_enter_virtual_mode();
-#endif
thread_info_cache_init();
cred_init();
fork_init(totalram_pages);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|