linux-kernel - [tip:x86/efi] efi: Add a stub for efi_enter_virtual

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-f383a1e37bc3fc93d19ed23dfdb1adfc5a7d1010@git.kernel.org>
Date:	Thu, 27 Sep 2012 14:56:01 -0700
From:	tip-bot for Josh Triplett <josh@...htriplett.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	josh@...htriplett.org, tglx@...utronix.de, hpa@...ux.intel.com,
	matt.fleming@...el.com
Subject: [tip:x86/efi] efi:
  Add a stub for efi_enter_virtual_mode on non-x86

Commit-ID:  f383a1e37bc3fc93d19ed23dfdb1adfc5a7d1010
Gitweb:     http://git.kernel.org/tip/f383a1e37bc3fc93d19ed23dfdb1adfc5a7d1010
Author:     Josh Triplett <josh@...htriplett.org>
AuthorDate: Sat, 8 Sep 2012 15:06:49 -0700
Committer:  H. Peter Anvin <hpa@...ux.intel.com>
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@...htriplett.org>
Link: http://lkml.kernel.org/r/993c7f2ee7d53cc480280653a7df500db0882342.1347141698.git.josh@joshtriplett.org
Acked-by: Matt Fleming <matt.fleming@...el.com>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
 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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/