x86, platform: Change is_untracked_pat_range() to bool; cleanup init

[pandora-kernel.git] / arch / x86 / kernel / x86_init.c

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 4790b92..861b8b5 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -13,6 +13,8 @@
 #include <asm/e820.h>
 #include <asm/time.h>
 #include <asm/irq.h>
+#include <asm/pat.h>
+#include <asm/tsc.h>
 
 void __cpuinit x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
@@ -22,12 +24,11 @@ void __init x86_init_pgd_noop(pgd_t *unused) { }
  * The platform setup functions are preset with the default functions
  * for standard PC hardware.
  */
-struct __initdata x86_init_ops x86_init = {
+struct x86_init_ops x86_init __initdata = {
 
        .resources = {
                .probe_roms             = x86_init_noop,
                .reserve_resources      = reserve_standard_io_resources,
-               .reserve_ebda_region    = reserve_ebda_region,
                .memory_setup           = default_machine_specific_memory_setup,
        },
 
@@ -64,6 +65,13 @@ struct __initdata x86_init_ops x86_init = {
        },
 };
 
-__cpuinitdata struct x86_cpuinit_ops x86_cpuinit = {
+struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
        .setup_percpu_clockev           = setup_secondary_APIC_clock,
 };
+
+struct x86_platform_ops x86_platform = {
+       .calibrate_tsc                  = native_calibrate_tsc,
+       .get_wallclock                  = mach_get_cmos_time,
+       .set_wallclock                  = mach_set_rtc_mmss,
+       .is_untracked_pat_range         = is_ISA_range,
+};