diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 17:05:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 17:05:47 -0400 |
commit | 78f28b7c555359c67c2a0d23f7436e915329421e (patch) | |
tree | 7f8197f82f83c0c19fd9bc85b5d10b5a755d0656 /arch/x86/xen/enlighten.c | |
parent | 3240a77b515f4a15e24d8a3a2135bc87b02cf1d6 (diff) | |
parent | 7bd867dfb4e0357e06a3211ab2bd0e714110def3 (diff) |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
x86: Move get/set_wallclock to x86_platform_ops
x86: platform: Fix section annotations
x86: apic namespace cleanup
x86: Distangle ioapic and i8259
x86: Add Moorestown early detection
x86: Add hardware_subarch ID for Moorestown
x86: Add early platform detection
x86: Move tsc_init to late_time_init
x86: Move tsc_calibration to x86_init_ops
x86: Replace the now identical time_32/64.c by time.c
x86: time_32/64.c unify profile_pc
x86: Move calibrate_cpu to tsc.c
x86: Make timer setup and global variables the same in time_32/64.c
x86: Remove mca bus ifdef from timer interrupt
x86: Simplify timer_ack magic in time_32.c
x86: Prepare unification of time_32/64.c
x86: Remove do_timer hook
x86: Add timer_init to x86_init_ops
x86: Move percpu clockevents setup to x86_init_ops
x86: Move xen_post_allocator_init into xen_pagetable_setup_done
...
Fix up conflicts in arch/x86/include/asm/io_apic.h
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 0dd0c2c6cae0..544eb7496531 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -912,19 +912,9 @@ static const struct pv_info xen_info __initdata = { | |||
912 | 912 | ||
913 | static const struct pv_init_ops xen_init_ops __initdata = { | 913 | static const struct pv_init_ops xen_init_ops __initdata = { |
914 | .patch = xen_patch, | 914 | .patch = xen_patch, |
915 | |||
916 | .banner = xen_banner, | ||
917 | .memory_setup = xen_memory_setup, | ||
918 | .arch_setup = xen_arch_setup, | ||
919 | .post_allocator_init = xen_post_allocator_init, | ||
920 | }; | 915 | }; |
921 | 916 | ||
922 | static const struct pv_time_ops xen_time_ops __initdata = { | 917 | static const struct pv_time_ops xen_time_ops __initdata = { |
923 | .time_init = xen_time_init, | ||
924 | |||
925 | .set_wallclock = xen_set_wallclock, | ||
926 | .get_wallclock = xen_get_wallclock, | ||
927 | .get_tsc_khz = xen_tsc_khz, | ||
928 | .sched_clock = xen_sched_clock, | 918 | .sched_clock = xen_sched_clock, |
929 | }; | 919 | }; |
930 | 920 | ||
@@ -990,8 +980,6 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { | |||
990 | 980 | ||
991 | static const struct pv_apic_ops xen_apic_ops __initdata = { | 981 | static const struct pv_apic_ops xen_apic_ops __initdata = { |
992 | #ifdef CONFIG_X86_LOCAL_APIC | 982 | #ifdef CONFIG_X86_LOCAL_APIC |
993 | .setup_boot_clock = paravirt_nop, | ||
994 | .setup_secondary_clock = paravirt_nop, | ||
995 | .startup_ipi_hook = paravirt_nop, | 983 | .startup_ipi_hook = paravirt_nop, |
996 | #endif | 984 | #endif |
997 | }; | 985 | }; |
@@ -1070,7 +1058,18 @@ asmlinkage void __init xen_start_kernel(void) | |||
1070 | pv_time_ops = xen_time_ops; | 1058 | pv_time_ops = xen_time_ops; |
1071 | pv_cpu_ops = xen_cpu_ops; | 1059 | pv_cpu_ops = xen_cpu_ops; |
1072 | pv_apic_ops = xen_apic_ops; | 1060 | pv_apic_ops = xen_apic_ops; |
1073 | pv_mmu_ops = xen_mmu_ops; | 1061 | |
1062 | x86_init.resources.memory_setup = xen_memory_setup; | ||
1063 | x86_init.oem.arch_setup = xen_arch_setup; | ||
1064 | x86_init.oem.banner = xen_banner; | ||
1065 | |||
1066 | x86_init.timers.timer_init = xen_time_init; | ||
1067 | x86_init.timers.setup_percpu_clockev = x86_init_noop; | ||
1068 | x86_cpuinit.setup_percpu_clockev = x86_init_noop; | ||
1069 | |||
1070 | x86_platform.calibrate_tsc = xen_tsc_khz; | ||
1071 | x86_platform.get_wallclock = xen_get_wallclock; | ||
1072 | x86_platform.set_wallclock = xen_set_wallclock; | ||
1074 | 1073 | ||
1075 | /* | 1074 | /* |
1076 | * Set up some pagetable state before starting to set any ptes. | 1075 | * Set up some pagetable state before starting to set any ptes. |
@@ -1095,6 +1094,7 @@ asmlinkage void __init xen_start_kernel(void) | |||
1095 | */ | 1094 | */ |
1096 | xen_setup_stackprotector(); | 1095 | xen_setup_stackprotector(); |
1097 | 1096 | ||
1097 | xen_init_mmu_ops(); | ||
1098 | xen_init_irq_ops(); | 1098 | xen_init_irq_ops(); |
1099 | xen_init_cpuid_mask(); | 1099 | xen_init_cpuid_mask(); |
1100 | 1100 | ||