x86: Move pci init function to x86_init

[safe/jmp/linux-2.6] / arch / x86 / kernel / x86_init.c

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 8cb5933..81faa6d 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -6,24 +6,33 @@
 #include <linux/init.h>
 
 #include <asm/bios_ebda.h>
+#include <asm/paravirt.h>
+#include <asm/pci_x86.h>
 #include <asm/mpspec.h>
 #include <asm/setup.h>
+#include <asm/apic.h>
 #include <asm/e820.h>
+#include <asm/time.h>
 #include <asm/irq.h>
+#include <asm/pat.h>
+#include <asm/tsc.h>
+#include <asm/iommu.h>
 
 void __cpuinit x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
+void __init x86_init_pgd_noop(pgd_t *unused) { }
+int __init iommu_init_noop(void) { return 0; }
+void iommu_shutdown_noop(void) { }
 
 /*
  * 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,
        },
 
@@ -40,5 +49,42 @@ struct __initdata x86_init_ops x86_init = {
        .irqs = {
                .pre_vector_init        = init_ISA_irqs,
                .intr_init              = native_init_IRQ,
+               .trap_init              = x86_init_noop,
        },
+
+       .oem = {
+               .arch_setup             = x86_init_noop,
+               .banner                 = default_banner,
+       },
+
+       .paging = {
+               .pagetable_setup_start  = native_pagetable_setup_start,
+               .pagetable_setup_done   = native_pagetable_setup_done,
+       },
+
+       .timers = {
+               .setup_percpu_clockev   = setup_boot_APIC_clock,
+               .tsc_pre_init           = x86_init_noop,
+               .timer_init             = hpet_time_init,
+       },
+
+       .iommu = {
+               .iommu_init             = iommu_init_noop,
+       },
+
+       .pci = {
+               .init                   = x86_default_pci_init,
+       },
+};
+
+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,
+       .iommu_shutdown                 = iommu_shutdown_noop,
+       .is_untracked_pat_range         = is_ISA_range,
 };