Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/kernel/mpparse_32.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/mpparse_64.c

+4 −7
Original line number Diff line number Diff line
@@ -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)

arch/x86/kernel/setup_32.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/x86/mm/discontig_32.c

+1 −1
Original line number Diff line number Diff line
@@ -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);