diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-12 22:52:55 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 08:19:45 +0200 |
| commit | 3d88cca7085cffce077f808f36551e9050eb9e3a (patch) | |
| tree | 6bdd386b67e0935b4c3c51b6ec31e40471cf3745 /arch/x86/kernel/numaq_32.c | |
| parent | 7b479becdb8c1fb4ff6fbb2a4076c471c737b54c (diff) | |
| download | linux-3d88cca7085cffce077f808f36551e9050eb9e3a.tar.bz2 | |
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>
Diffstat (limited to 'arch/x86/kernel/numaq_32.c')
| -rw-r--r-- | arch/x86/kernel/numaq_32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index f0f1de1c4a1d..5b20a5e7ac28 100644 --- a/arch/x86/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c @@ -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); |