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/cpu/intel.c | |
| parent | 7b479becdb8c1fb4ff6fbb2a4076c471c737b54c (diff) | |
| download | blackbird-op-linux-3d88cca7085cffce077f808f36551e9050eb9e3a.tar.gz blackbird-op-linux-3d88cca7085cffce077f808f36551e9050eb9e3a.zip | |
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/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index fe9224c51d37..70609efdf1da 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -226,6 +226,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) if (cpu_has_bts) ds_init_intel(c); + +#ifdef CONFIG_X86_NUMAQ + numaq_tsc_disable(); +#endif } static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size) |
