Commit ce3fe6b2 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar

x86: use get_bios_ebda in mpparse_64.c

Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e3e3ffa2
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include <asm/bios_ebda.h>
#include <mach_apic.h> #include <mach_apic.h>
#include <mach_apicdef.h> #include <mach_apicdef.h>
#include <mach_mpparse.h> #include <mach_mpparse.h>
#include <bios_ebda.h>
/* Have we found an MP table */ /* Have we found an MP table */
int smp_found_config; int smp_found_config;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/acpi.h> #include <asm/acpi.h>
#include <asm/bios_ebda.h>
#include <mach_apic.h> #include <mach_apic.h>
...@@ -641,13 +642,9 @@ static void __init __find_smp_config(unsigned reserve) ...@@ -641,13 +642,9 @@ static void __init __find_smp_config(unsigned reserve)
* should be fixed. * should be fixed.
*/ */
address = *(unsigned short *)phys_to_virt(0x40E); address = get_bios_ebda();
address <<= 4; if (address)
if (smp_scan_config(address, 0x1000, reserve)) 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");
} }
void __init early_find_smp_config(void) void __init early_find_smp_config(void)
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/vmi.h> #include <asm/vmi.h>
#include <setup_arch.h> #include <setup_arch.h>
#include <bios_ebda.h> #include <asm/bios_ebda.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/processor.h> #include <asm/processor.h>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/e820.h> #include <asm/e820.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mmzone.h> #include <asm/mmzone.h>
#include <bios_ebda.h> #include <asm/bios_ebda.h>
struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
EXPORT_SYMBOL(node_data); EXPORT_SYMBOL(node_data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment