linux-kernel - [tip:x86/atomic] x86, atomic64: In selftest, distinguish x86-64 from 586+

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-a5c9161f27c3e1ae6c0094d262f03a7e98262181@git.kernel.org>
Date:	Mon, 1 Mar 2010 19:59:23 GMT
From:	"tip-bot for H. Peter Anvin" <hpa@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	luca@...a-barbieri.com, tglx@...utronix.de
Subject: [tip:x86/atomic] x86, atomic64: In selftest, distinguish x86-64 from 586+

Commit-ID:  a5c9161f27c3e1ae6c0094d262f03a7e98262181
Gitweb:     http://git.kernel.org/tip/a5c9161f27c3e1ae6c0094d262f03a7e98262181
Author:     H. Peter Anvin <hpa@...or.com>
AuthorDate: Mon, 1 Mar 2010 11:49:23 -0800
Committer:  H. Peter Anvin <hpa@...or.com>
CommitDate: Mon, 1 Mar 2010 11:51:56 -0800

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@...or.com>
Cc: Luca Barbieri <luca@...a-barbieri.com>
LKML-Reference: <1267005265-27958-4-git-send-email-luca@...a-barbieri.com>
---
 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 f7bb706..65e482c 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/