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>

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 14d11071675f87a74036d46b1cb1b396be1dc4ff..75e9e68d635fd2d4ab9e4b1d5647d8653656863c 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -1,11 +1,21 @@
 #ifndef _ASM_X86_PLATFORM_H
 #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 3f8579f8d42cfa52710cc2331494542b1d1942dc..4049353152cf99ccff069eb953ee115d732e88bc 100644 (file)
--- 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 63f32d220ef22e2d681078ec556698e15ff7645f..5796eb158d49bccee884bf738756cd32a939a700 100644 (file)
--- 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 82d510c9c996e6eb5cf4407625bd7b53a4fe649e..88883f8006c2a47145d6f329d76c5df9a1a6ee7f 100644 (file)
--- 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,
+       },
 };