]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/x86/kernel/apic/apic.c
Merge branch 'linus' into x86/urgent
[linux-2.6.git] / arch / x86 / kernel / apic / apic.c
index 2d59dfa29785c832ac2742dd0bf437fe94a9d9b3..a58ef98be1557164860c689473eb1b6959fc7b18 100644 (file)
@@ -36,6 +36,7 @@
 #include <linux/mm.h>
 
 #include <asm/perf_counter.h>
+#include <asm/x86_init.h>
 #include <asm/pgalloc.h>
 #include <asm/atomic.h>
 #include <asm/mpspec.h>
@@ -1708,7 +1709,7 @@ int __init APIC_init_uniprocessor(void)
        localise_nmi_watchdog();
 #endif
 
-       setup_boot_clock();
+       x86_init.timers.setup_percpu_clockev();
 #ifdef CONFIG_X86_64
        check_nmi_watchdog();
 #endif