diff --git a/[refs] b/[refs] index a3d5a3bc5bad..677eeb0604df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7946612de2087e163308e26034286fc2dc9dacf1 +refs/heads/master: b2a6a58ca6a3ddf4e278a53199c5b8fd39adbc0e diff --git a/trunk/arch/x86/kernel/numaq_32.c b/trunk/arch/x86/kernel/numaq_32.c index b8c45610b20a..eecc8c18f010 100644 --- a/trunk/arch/x86/kernel/numaq_32.c +++ b/trunk/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;