---

yaml
---
r: 191471
b: refs/heads/master
c: a5c9161
h: refs/heads/master
i:
  191469: 6dc4264
  191467: 4ed735a
  191463: 9c2ad8f
  191455: 09df972
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3e83131469e29032a700217aa394996107b8fc5
+refs/heads/master: a5c9161f27c3e1ae6c0094d262f03a7e98262181

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