diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
| commit | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch) | |
| tree | a1d9511e488e19d41089ff0a736f6ce52a81c6e5 /arch/x86/kernel/numaq_32.c | |
| parent | 93a0886e2368eafb9df5e2021fb185195cee88b2 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'arch/x86/kernel/numaq_32.c')
| -rw-r--r-- | arch/x86/kernel/numaq_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index 5b20a5e7ac28..a23e8233b9ac 100644 --- a/arch/x86/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c | |||
| @@ -96,7 +96,7 @@ int __init get_memcfg_numaq(void) | |||
| 96 | void __init numaq_tsc_disable(void) | 96 | void __init numaq_tsc_disable(void) |
| 97 | { | 97 | { |
| 98 | if (!found_numaq) | 98 | if (!found_numaq) |
| 99 | return -1; | 99 | return; |
| 100 | 100 | ||
| 101 | if (num_online_nodes() > 1) { | 101 | if (num_online_nodes() > 1) { |
| 102 | printk(KERN_DEBUG "NUMAQ: disabling TSC\n"); | 102 | printk(KERN_DEBUG "NUMAQ: disabling TSC\n"); |