From 29c740e7e02f5c0a7b7845ad742bfc324143e4b7 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Mon, 23 Jun 2008 19:53:33 -0700
Subject: [PATCH] --- yaml --- r: 99887 b: refs/heads/master c:
 7465252ea0121c9cd28be68dfb86293a7554a111 h: refs/heads/master i:   99885:
 91784c10f6d64424bc2762cc8ed2fddf719a29f0   99883:
 0181d3fe8beec68331ca896d127590b65ad8230b   99879:
 df7e7d3366484f8f585d6ff7228c217ded7547a8   99871:
 a27bf7f91fd566040ca04f7200aea33a1df952a6 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kernel/setup_32.c | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 13091ba69d19..8705780451b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11cd0bc140b5d66566c9eb49c1058737888cd75c
+refs/heads/master: 7465252ea0121c9cd28be68dfb86293a7554a111
diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c
index 220d92faf0a9..52f4e01bb655 100644
--- a/trunk/arch/x86/kernel/setup_32.c
+++ b/trunk/arch/x86/kernel/setup_32.c
@@ -336,14 +336,6 @@ void __init setup_arch(char **cmdline_p)
 	early_ioremap_init();
 	reserve_setup_data();
 
-#ifdef CONFIG_EFI
-	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
-		     "EL32", 4)) {
-		efi_enabled = 1;
-		efi_reserve_early();
-	}
-#endif
-
 	ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
 	screen_info = boot_params.screen_info;
 	edid_info = boot_params.edid_info;
@@ -363,10 +355,17 @@ void __init setup_arch(char **cmdline_p)
 	rd_prompt = ((boot_params.hdr.ram_size & RAMDISK_PROMPT_FLAG) != 0);
 	rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0);
 #endif
+#ifdef CONFIG_EFI
+	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
+		     "EL32", 4)) {
+		efi_enabled = 1;
+		efi_reserve_early();
+	}
+#endif
+
 	ARCH_SETUP
 
 	setup_memory_map();
-
 	copy_edd();
 
 	if (!boot_params.hdr.root_flags)