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

Commit 356fa0c6 authored by Akinobu Mita's avatar Akinobu Mita Committed by Ingo Molnar
Browse files

x86: use get_bios_ebda() 



Use get_bios_ebda().

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ae5830a6

arch/x86/kernel/head64.c

+2 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/sections.h>

#include <asm/kdebug.h>

#include <asm/e820.h>

#include <asm/bios_ebda.h>



static void __init zap_identity_mappings(void)

{
@@ -49,7 +50,6 @@ static void __init copy_bootdata(char *real_mode_data) 
	}

}



#define BIOS_EBDA_SEGMENT 0x40E

#define BIOS_LOWMEM_KILOBYTES 0x413



/*
@@ -80,8 +80,7 @@ static void __init reserve_ebda_region(void) 
	lowmem <<= 10;



	/* start of EBDA area */

	ebda_addr = *(unsigned short *)__va(BIOS_EBDA_SEGMENT);

	ebda_addr <<= 4;

	ebda_addr = get_bios_ebda();



	/* Fixup: bios puts an EBDA in the top 64K segment */

	/* of conventional memory, but does not adjust lowmem. */

arch/x86/kernel/setup_32.c

+1 −3
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ unsigned long __init find_max_low_pfn(void) 
	return max_low_pfn;

}



#define BIOS_EBDA_SEGMENT 0x40E

#define BIOS_LOWMEM_KILOBYTES 0x413



/*
@@ -420,8 +419,7 @@ static void __init reserve_ebda_region(void) 
	lowmem <<= 10;



	/* start of EBDA area */

	ebda_addr = *(unsigned short *)__va(BIOS_EBDA_SEGMENT);

	ebda_addr <<= 4;

	ebda_addr = get_bios_ebda();



	/* Fixup: bios puts an EBDA in the top 64K segment */

	/* of conventional memory, but does not adjust lowmem. */

arch/x86/kernel/summit_32.c

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/mm.h>

#include <linux/init.h>

#include <asm/io.h>

#include <asm/bios_ebda.h>

#include <asm/mach-summit/mach_mpparse.h>



static struct rio_table_hdr *rio_table_hdr __initdata;
@@ -140,8 +141,8 @@ void __init setup_summit(void) 
	int			i, next_wpeg, next_bus = 0;



	/* The pointer to the EBDA is stored in the word @ phys 0x40E(40:0E) */

	ptr = *(unsigned short *)phys_to_virt(0x40Eul);

	ptr = (unsigned long)phys_to_virt(ptr << 4);

	ptr = get_bios_ebda();

	ptr = (unsigned long)phys_to_virt(ptr);



	rio_table_hdr = NULL;

	offset = 0x180;