diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-03-01 11:49:23 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-03-01 11:51:56 -0800 |
| commit | a5c9161f27c3e1ae6c0094d262f03a7e98262181 (patch) | |
| tree | 484be5657daf938e76dc61126fc96f9dcfdf8d15 /lib | |
| parent | f3e83131469e29032a700217aa394996107b8fc5 (diff) | |
| download | linux-stable-a5c9161f27c3e1ae6c0094d262f03a7e98262181.tar.gz linux-stable-a5c9161f27c3e1ae6c0094d262f03a7e98262181.tar.bz2 linux-stable-a5c9161f27c3e1ae6c0094d262f03a7e98262181.zip | |
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/atomic64_test.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/atomic64_test.c b/lib/atomic64_test.c index f7bb706c9c3a..65e482caf5e9 100644 --- a/lib/atomic64_test.c +++ b/lib/atomic64_test.c @@ -144,14 +144,16 @@ static __init int test_atomic64(void) BUG_ON(v.counter != r); #ifdef CONFIG_X86 - printk(KERN_INFO "atomic64 test passed for %s+ platform %s CX8 and %s SSE\n", -#ifdef CONFIG_X86_CMPXCHG64 - "586", + printk(KERN_INFO "atomic64 test passed for %s platform %s CX8 and %s SSE\n", +#ifdef CONFIG_X86_64 + "x86-64", +#elif defined(CONFIG_X86_CMPXCHG64) + "i586+", #else - "386", + "i386+", #endif - boot_cpu_has(X86_FEATURE_CX8) ? "with" : "without", - boot_cpu_has(X86_FEATURE_XMM) ? "with" : "without"); + boot_cpu_has(X86_FEATURE_CX8) ? "with" : "without", + boot_cpu_has(X86_FEATURE_XMM) ? "with" : "without"); #else printk(KERN_INFO "atomic64 test passed\n"); #endif |