x86: fix numaq_tsc_disable calling
got this on a test-system: calling numaq_tsc_disable+0x0/0x39 NUMAQ: disabling TSC initcall numaq_tsc_disable+0x0/0x39 returned 0 after 0 msecs that's because we should not be using arch_initcall to call numaq_tsc_disable. need to call it in setup_arch before time_init()/tsc_init() and call it in init_intel() to make the cpu feature bits right. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -93,12 +93,13 @@ int __init get_memcfg_numaq(void)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int __init numaq_tsc_disable(void)
|
||||
void __init numaq_tsc_disable(void)
|
||||
{
|
||||
if (!found_numaq)
|
||||
return -1;
|
||||
|
||||
if (num_online_nodes() > 1) {
|
||||
printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
|
||||
setup_clear_cpu_cap(X86_FEATURE_TSC);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
arch_initcall(numaq_tsc_disable);
|
||||
|
Reference in New Issue
Block a user