summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-19 14:43:56 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 17:12:52 +0200
commitf7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc (patch)
tree9ab5f0e8e895681a326dd94cb969c950c03271aa
parent57844a8f8e29802f37ad9a0f94eb11d6ae358603 (diff)
downloadop-kernel-dev-f7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc.zip
op-kernel-dev-f7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc.tar.gz
x86: Add probe_roms to x86_init
probe_roms is only used on 32bit. Add it to the x86_init ops and remove the #ifdefs. Default initializer is x86_init_noop() which is overridden in the 32bit boot code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/include/asm/x86_init.h10
-rw-r--r--arch/x86/kernel/head32.c3
-rw-r--r--arch/x86/kernel/setup.c4
-rw-r--r--arch/x86/kernel/x86_init.c4
4 files changed, 18 insertions, 3 deletions
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 14d1107..75e9e68 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -2,10 +2,20 @@
#define _ASM_X86_PLATFORM_H
/**
+ * struct x86_init_resources - platform specific resource related ops
+ * @probe_roms: probe BIOS roms
+ *
+ */
+struct x86_init_resources {
+ void (*probe_roms)(void);
+};
+
+/**
* struct x86_init_ops - functions for platform specific setup
*
*/
struct x86_init_ops {
+ struct x86_init_resources resources;
};
extern struct x86_init_ops x86_init;
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index 3f8579f..4049353 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -29,6 +29,9 @@ void __init i386_start_kernel(void)
reserve_early(ramdisk_image, ramdisk_end, "RAMDISK");
}
#endif
+ /* Initilize 32bit specific setup functions */
+ x86_init.resources.probe_roms = probe_roms;
+
reserve_ebda_region();
/*
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 63f32d2..5796eb1 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -835,9 +835,7 @@ void __init setup_arch(char **cmdline_p)
*/
init_hypervisor(&boot_cpu_data);
-#ifdef CONFIG_X86_32
- probe_roms();
-#endif
+ x86_init.resources.probe_roms();
/* after parse_early_param, so could debug it */
insert_resource(&iomem_resource, &code_resource);
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 82d510c..88883f8 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -14,4 +14,8 @@ void __cpuinit x86_init_noop(void) { }
* for standard PC hardware.
*/
struct __initdata x86_init_ops x86_init = {
+
+ .resources = {
+ .probe_roms = x86_init_noop,
+ },
};
OpenPOWER on IntegriCloud