aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/head32.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-19 14:36:27 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 17:12:52 +0200
commit816c25e7d4fb6fd40022a376e8b7f45b1edf5a89 (patch)
tree75d9b4f37396b52ee306c3acd0dc32b0881365e0 /arch/x86/kernel/head32.c
parentx86: Add request_standard_resources to x86_init (diff)
downloadlinux-dev-816c25e7d4fb6fd40022a376e8b7f45b1edf5a89.tar.xz
linux-dev-816c25e7d4fb6fd40022a376e8b7f45b1edf5a89.zip
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: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/head32.c')
-rw-r--r--arch/x86/kernel/head32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index d91c37c02069..921a23b6c145 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -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