From: Josh Triplett <josh@joshtriplett.org>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Len Brown <lenb@kernel.org>,
Matt Fleming <matt.fleming@intel.com>,
Olof Johansson <olof@lixom.net>, Matthew Garrett <mjg@redhat.com>,
David Howells <dhowells@redhat.com>,
Rusty Russell <rusty@rustcorp.com.au>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Pawel Moll <pawel.moll@arm.com>,
linux-acpi@vger.kernel.org
Subject: [PATCHv2 1/4] efi: Add a stub for efi_enter_virtual_mode on non-x86
Date: Tue, 4 Sep 2012 14:23:50 -0700 [thread overview]
Message-ID: <a3207a2f6dc5676d142dd1241aa87012d8cb148f.1346792566.git.josh@joshtriplett.org> (raw)
In-Reply-To: <cover.1346792566.git.josh@joshtriplett.org>
This eliminates an ifdef in init/main.c.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
---
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);
--
1.7.10.4
next prev parent reply other threads:[~2012-09-04 21:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 21:21 [PATCHv2 0/4] Fix ACPI BGRT support for images located in EFI boot services memory Josh Triplett
2012-09-04 21:23 ` Josh Triplett [this message]
2012-09-04 21:23 ` [PATCHv2 2/4] efi: Defer freeing boot services memory until freeing __init memory Josh Triplett
2012-09-04 21:24 ` [PATCHv2 3/4] efi: Add a function to look up existing IO memory mappings Josh Triplett
2012-09-04 21:24 ` [PATCHv2 4/4] efi: Fix the ACPI BGRT driver for images located in EFI boot services memory Josh Triplett
2012-09-04 23:28 ` [PATCHv2 0/4] Fix ACPI BGRT support " Josh Triplett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a3207a2f6dc5676d142dd1241aa87012d8cb148f.1346792566.git.josh@joshtriplett.org \
--to=josh@joshtriplett.org \
--cc=a.p.zijlstra@chello.nl \
--cc=dhowells@redhat.com \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=mingo@redhat.com \
--cc=mjg@redhat.com \
--cc=olof@lixom.net \
--cc=pawel.moll@arm.com \
--cc=rusty@rustcorp.com.au \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).