From 1b82037c4bde06d698bcd8e72aa9e7d233380de3 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Mon, 17 Mar 2008 22:08:17 +0300
Subject: [PATCH] --- yaml --- r: 88863 b: refs/heads/master c:
 ce3fe6b2bfded4f5d931c5f2f9325dc2e3fd3a74 h: refs/heads/master i:   88861:
 7f2e58d3af951eec660b890586befa2df11fa689   88859:
 61f6519f5922384f91238cff81053e02ee3141c4   88855:
 d682c9b7d632fe20c0233291d4a611a0991ca755   88847:
 692047902e71e3bd9a8e1dbaf57d5adb91c38246   88831:
 1c4cf3aaafa5540de766ecfe9e82666a5a9568f9 v: v3

---
 [refs]                                               |  2 +-
 trunk/arch/x86/kernel/mpparse_32.c                   |  2 +-
 trunk/arch/x86/kernel/mpparse_64.c                   | 11 ++++-------
 trunk/arch/x86/kernel/setup_32.c                     |  2 +-
 trunk/arch/x86/mm/discontig_32.c                     |  2 +-
 trunk/include/asm-x86/{mach-default => }/bios_ebda.h |  0
 6 files changed, 8 insertions(+), 11 deletions(-)
 rename trunk/include/asm-x86/{mach-default => }/bios_ebda.h (100%)

diff --git a/[refs] b/[refs]
index 103a46782176..004ebf669921 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3e3ffa20351b32b5eaa6020d051305c8d803ed4
+refs/heads/master: ce3fe6b2bfded4f5d931c5f2f9325dc2e3fd3a74
diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c
index 838e4974e1ce..a2162644cb4e 100644
--- a/trunk/arch/x86/kernel/mpparse_32.c
+++ b/trunk/arch/x86/kernel/mpparse_32.c
@@ -27,11 +27,11 @@
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
 #include <asm/io_apic.h>
+#include <asm/bios_ebda.h>
 
 #include <mach_apic.h>
 #include <mach_apicdef.h>
 #include <mach_mpparse.h>
-#include <bios_ebda.h>
 
 /* Have we found an MP table */
 int smp_found_config;
diff --git a/trunk/arch/x86/kernel/mpparse_64.c b/trunk/arch/x86/kernel/mpparse_64.c
index 269fd46df42c..fb74135f9d0e 100644
--- a/trunk/arch/x86/kernel/mpparse_64.c
+++ b/trunk/arch/x86/kernel/mpparse_64.c
@@ -29,6 +29,7 @@
 #include <asm/io_apic.h>
 #include <asm/proto.h>
 #include <asm/acpi.h>
+#include <asm/bios_ebda.h>
 
 #include <mach_apic.h>
 
@@ -641,13 +642,9 @@ static void __init __find_smp_config(unsigned reserve)
 	 * should be fixed.
 	 */
 
-	address = *(unsigned short *)phys_to_virt(0x40E);
-	address <<= 4;
-	if (smp_scan_config(address, 0x1000, reserve))
-		return;
-
-	/* If we have come this far, we did not find an MP table  */
-	printk(KERN_INFO "No mptable found.\n");
+	address = get_bios_ebda();
+	if (address)
+		smp_scan_config(address, 0x1000, reserve);
 }
 
 void __init early_find_smp_config(void)
diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c
index eb97bcfe0f6f..58f3c1fbc5c3 100644
--- a/trunk/arch/x86/kernel/setup_32.c
+++ b/trunk/arch/x86/kernel/setup_32.c
@@ -62,7 +62,7 @@
 #include <asm/io.h>
 #include <asm/vmi.h>
 #include <setup_arch.h>
-#include <bios_ebda.h>
+#include <asm/bios_ebda.h>
 #include <asm/cacheflush.h>
 #include <asm/processor.h>
 
diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
index 8e25e06ff730..eba0bbede7a6 100644
--- a/trunk/arch/x86/mm/discontig_32.c
+++ b/trunk/arch/x86/mm/discontig_32.c
@@ -37,7 +37,7 @@
 #include <asm/e820.h>
 #include <asm/setup.h>
 #include <asm/mmzone.h>
-#include <bios_ebda.h>
+#include <asm/bios_ebda.h>
 
 struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);
diff --git a/trunk/include/asm-x86/mach-default/bios_ebda.h b/trunk/include/asm-x86/bios_ebda.h
similarity index 100%
rename from trunk/include/asm-x86/mach-default/bios_ebda.h
rename to trunk/include/asm-x86/bios_ebda.h