From ec63d57a292d5ecdfcad5ad97c714ea875abd269 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 17 Sep 2009 02:25:05 +0200
Subject: [PATCH] --- yaml --- r: 162843 b: refs/heads/master c:
 43e6ae6d9f08304682294c14c6b7f2b2441668e7 h: refs/heads/master i:   162841:
 01805819675eb207e9813350582191d6cbdd7985   162839:
 b322d704dbc5cfaadd5529cf44a7aa61a415c280 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/mips/include/asm/system.h | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e5c933f95e99..6d40fcb4524d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1e39a4a616cd9981a9decfd5332fd07a01abb8b
+refs/heads/master: 43e6ae6d9f08304682294c14c6b7f2b2441668e7
diff --git a/trunk/arch/mips/include/asm/system.h b/trunk/arch/mips/include/asm/system.h
index 23f68b40d4bb..cc7262ff0765 100644
--- a/trunk/arch/mips/include/asm/system.h
+++ b/trunk/arch/mips/include/asm/system.h
@@ -66,16 +66,11 @@ do {									\
 #define __mips_mt_fpaff_switch_to(prev) do { (void) (prev); } while (0)
 #endif
 
-#ifdef CONFIG_CPU_HAS_LLSC
-#define __clear_software_ll_bit() do { } while (0)
-#else
-extern unsigned long ll_bit;
-
 #define __clear_software_ll_bit()					\
 do {									\
-	ll_bit = 0;							\
+	if (!__builtin_constant_p(cpu_has_llsc) || !cpu_has_llsc)	\
+		ll_bit = 0;						\
 } while (0)
-#endif
 
 #define switch_to(prev, next, last)					\
 do {									\