Merge branch 'x86/cpu' into x86/xsave

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / numaq_32.c

diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 2434467ddf72a9722553e880917361d699b4c1be..4caff39078e0d386a0f1d2783fbc7e081582d9a9 100644 (file)
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -73,7 +73,7 @@ static void __init smp_dump_qct(void)
 }
 
 
-void __init numaq_tsc_disable(void)
+void __cpuinit numaq_tsc_disable(void)
 {
        if (!found_numaq)
                return;