diff options
author | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
---|---|---|
committer | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /arch/x86/kernel/process.c | |
parent | Merge branch 'linus' into perfcounters/core (diff) | |
parent | Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86... (diff) | |
download | kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.gz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.xz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.zip |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r-- | arch/x86/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 6d12f7e37f8c..87b69d4fac16 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -350,7 +350,7 @@ static void c1e_idle(void) void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) { -#ifdef CONFIG_X86_SMP +#ifdef CONFIG_SMP if (pm_idle == poll_idle && smp_num_siblings > 1) { printk(KERN_WARNING "WARNING: polling idle and HT enabled," " performance may degrade.\n"); |