From 81c6b4c516c5f2cb1ccdcf459a22d121401bedea Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 1 Mar 2010 11:49:23 -0800
Subject: [PATCH] --- yaml --- r: 191471 b: refs/heads/master c:
 a5c9161f27c3e1ae6c0094d262f03a7e98262181 h: refs/heads/master i:   191469:
 6dc4264b0432fbdd3064cfd50701d4848a84e896   191467:
 4ed735a3c99fad7fa57627f397d0d1af663af464   191463:
 9c2ad8f8b56ef1bd8469269281b25d8050808954   191455:
 09df972059a9f5377165727da519572fbda131ce v: v3

---
 [refs]                    |  2 +-
 trunk/lib/atomic64_test.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index dab1a3e7e42d..da7fff1fcde1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3e83131469e29032a700217aa394996107b8fc5
+refs/heads/master: a5c9161f27c3e1ae6c0094d262f03a7e98262181
diff --git a/trunk/lib/atomic64_test.c b/trunk/lib/atomic64_test.c
index f7bb706c9c3a..65e482caf5e9 100644
--- a/trunk/lib/atomic64_test.c
+++ b/trunk/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