diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:45:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:45:49 -0500 |
| commit | 15c989d4d14b82f43cae7efc6a7794cdd556f274 (patch) | |
| tree | 3f1a22991aacf42acaf56467cbe79897146d3e32 /arch/x86/kernel/process.c | |
| parent | 4e3eaddd142e2142c048c5052a0a9d2604fccfc6 (diff) | |
| parent | 0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems
x86, UV: Fix target_cpus() in x2apic_uv_x.c
x86: Reduce per cpu warning boot up messages
x86: Reduce per cpu MCA boot up messages
x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already
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 02d678065d7d..ad9540676fcc 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
| @@ -607,7 +607,7 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) | |||
| 607 | { | 607 | { |
| 608 | #ifdef CONFIG_SMP | 608 | #ifdef CONFIG_SMP |
| 609 | if (pm_idle == poll_idle && smp_num_siblings > 1) { | 609 | if (pm_idle == poll_idle && smp_num_siblings > 1) { |
| 610 | printk(KERN_WARNING "WARNING: polling idle and HT enabled," | 610 | printk_once(KERN_WARNING "WARNING: polling idle and HT enabled," |
| 611 | " performance may degrade.\n"); | 611 | " performance may degrade.\n"); |
| 612 | } | 612 | } |
| 613 | #endif | 613 | #endif |