diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-13 07:52:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 08:19:45 +0200 |
| commit | 3d88cca7085cffce077f808f36551e9050eb9e3a (patch) | |
| tree | 6bdd386b67e0935b4c3c51b6ec31e40471cf3745 /arch/x86/kernel/setup.c | |
| parent | x86, e820: remove end_user_pfn (diff) | |
| download | linux-3d88cca7085cffce077f808f36551e9050eb9e3a.tar.xz 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/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 987b6fde3a99..36c540d4ac4b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -849,6 +849,14 @@ void __init setup_arch(char **cmdline_p) init_cpu_to_node(); #endif +#ifdef CONFIG_X86_NUMAQ + /* + * need to check online nodes num, call it + * here before time_init/tsc_init + */ + numaq_tsc_disable(); +#endif + init_apic_mappings(); ioapic_init_mappings(); |