x86, atomic64: In selftest, distinguish x86-64 from 586+

The x86-64 implementation of the atomics is totally different from the
i586+ implementation, which makes it quite confusing to call it
"586+".  Also fix indentation, and add "i" for "i386" and "i586" as
used elsewhere in the kernel.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Luca Barbieri <luca@luca-barbieri.com>
LKML-Reference: <1267005265-27958-4-git-send-email-luca@luca-barbieri.com>
This commit is contained in:
H. Peter Anvin 2010-03-01 11:49:23 -08:00
parent f3e8313146
commit a5c9161f27

View file

@ -144,14 +144,16 @@ static __init int test_atomic64(void)
BUG_ON(v.counter != r); BUG_ON(v.counter != r);
#ifdef CONFIG_X86 #ifdef CONFIG_X86
printk(KERN_INFO "atomic64 test passed for %s+ platform %s CX8 and %s SSE\n", printk(KERN_INFO "atomic64 test passed for %s platform %s CX8 and %s SSE\n",
#ifdef CONFIG_X86_CMPXCHG64 #ifdef CONFIG_X86_64
"586", "x86-64",
#elif defined(CONFIG_X86_CMPXCHG64)
"i586+",
#else #else
"386", "i386+",
#endif #endif
boot_cpu_has(X86_FEATURE_CX8) ? "with" : "without", boot_cpu_has(X86_FEATURE_CX8) ? "with" : "without",
boot_cpu_has(X86_FEATURE_XMM) ? "with" : "without"); boot_cpu_has(X86_FEATURE_XMM) ? "with" : "without");
#else #else
printk(KERN_INFO "atomic64 test passed\n"); printk(KERN_INFO "atomic64 test passed\n");
#endif #endif