diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 07:56:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 07:56:43 -0700 |
| commit | 15b0404272e1513940223cf9eefadfd22804a060 (patch) | |
| tree | 9bdb1c0a41d0c3bddbae8885d361e053bbcd6d97 /arch/x86/kernel/cpu/bugs_64.c | |
| parent | 9b74aec028e7d7ce57b8deef490e440003555520 (diff) | |
| parent | d535e4319a2e598ba25dc966ada4e52ea774e33f (diff) | |
| download | kernel-crypto-15b0404272e1513940223cf9eefadfd22804a060.tar.gz kernel-crypto-15b0404272e1513940223cf9eefadfd22804a060.tar.xz kernel-crypto-15b0404272e1513940223cf9eefadfd22804a060.zip | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Make memtype_seq_ops const
x86: uv: Clean up uv_ptc_init(), use proc_create()
x86: Use printk_once()
x86/cpu: Clean up various files a bit
x86: Remove duplicated #include
x86, ipi: Clean up safe_smp_processor_id() by using the cpu_has_apic() macro helper
x86: Clean up idt_descr and idt_tableby using NR_VECTORS instead of hardcoded number
x86: Further clean up of mtrr/generic.c
x86: Clean up mtrr/main.c
x86: Clean up mtrr/state.c
x86: Clean up mtrr/mtrr.h
x86: Clean up mtrr/if.c
x86: Clean up mtrr/generic.c
x86: Clean up mtrr/cyrix.c
x86: Clean up mtrr/cleanup.c
x86: Clean up mtrr/centaur.c
x86: Clean up mtrr/amd.c:
x86: ds.c fix invalid assignment
Diffstat (limited to 'arch/x86/kernel/cpu/bugs_64.c')
| -rw-r--r-- | arch/x86/kernel/cpu/bugs_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c index 9a3ed0649d4..04f0fe5af83 100644 --- a/arch/x86/kernel/cpu/bugs_64.c +++ b/arch/x86/kernel/cpu/bugs_64.c @@ -15,7 +15,7 @@ void __init check_bugs(void) { identify_boot_cpu(); #if !defined(CONFIG_SMP) - printk("CPU: "); + printk(KERN_INFO "CPU: "); print_cpu_info(&boot_cpu_data); #endif alternative_instructions(); |