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

Commit 816c25e7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Add reserve_ebda_region to x86_init_ops 



reserve_ebda_region needs to be called befor start_kernel. Moorestown
needs to override it. Make it a x86_init_ops function and initialize
it with the default reserve_ebda_region.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8fee697d

arch/x86/include/asm/x86_init.h

+2 −0
Original line number Diff line number Diff line
@@ -6,11 +6,13 @@ 
 * @probe_roms:			probe BIOS roms

 * @reserve_resources:		reserve the standard resources for the

 *				platform

 * @reserve_ebda_region:	reserve the extended bios data area

 *

 */

struct x86_init_resources {

	void (*probe_roms)(void);

	void (*reserve_resources)(void);

	void (*reserve_ebda_region)(void);

};



/**

arch/x86/kernel/head32.c

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <asm/setup.h>

#include <asm/sections.h>

#include <asm/e820.h>

#include <asm/bios_ebda.h>

#include <asm/page.h>

#include <asm/trampoline.h>



void __init i386_start_kernel(void)
@@ -33,7 +33,7 @@ void __init i386_start_kernel(void) 
	x86_init.resources.probe_roms = probe_roms;

	x86_init.resources.reserve_resources = i386_reserve_resources;



	reserve_ebda_region();

	x86_init.resources.reserve_ebda_region();



	/*

	 * At this point everything still needed from the boot loader

arch/x86/kernel/head64.c

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

#include <asm/kdebug.h>

#include <asm/e820.h>

#include <asm/bios_ebda.h>

#include <asm/trampoline.h>



static void __init zap_identity_mappings(void)
@@ -112,7 +111,7 @@ void __init x86_64_start_reservations(char *real_mode_data) 
	}

#endif



	reserve_ebda_region();

	x86_init.resources.reserve_ebda_region();



	/*

	 * At this point everything still needed from the boot loader

arch/x86/kernel/x86_init.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 */

#include <linux/init.h>



#include <asm/bios_ebda.h>

#include <asm/setup.h>



void __cpuinit x86_init_noop(void) { }
@@ -18,5 +19,6 @@ struct __initdata x86_init_ops x86_init = { 
	.resources = {

		.probe_roms		= x86_init_noop,

		.reserve_resources	= reserve_standard_io_resources,

		.reserve_ebda_region	= reserve_ebda_region,

	},

};