MIPS: Consolidate all CONFIG_CPU_HAS_LLSC use in a single C file.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

4 files changed, 12 insertions, 9 deletions

diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
index cd30f83235bb..a2e9239b45aa 100644
--- a/arch/mips/include/asm/system.h
+++ b/arch/mips/include/asm/system.h
@@ -63,11 +63,23 @@ 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;                                                     \
+} while (0)
+#endif
+
 #define switch_to(prev, next, last)                                     \
 do {                                                                    \
         __mips_mt_fpaff_switch_to(prev);                                \
         if (cpu_has_dsp)                                                \
                 __save_dsp(prev);                                       \
+        __clear_software_ll_bit();                                      \
         (last) = resume(prev, next, task_thread_info(next));            \
 } while (0)
 
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S
index d52389672b06..3952b8323efa 100644
--- a/arch/mips/kernel/octeon_switch.S
+++ b/arch/mips/kernel/octeon_switch.S
@@ -36,9 +36,6 @@
         .align  7
         LEAF(resume)
         .set arch=octeon
-#ifndef CONFIG_CPU_HAS_LLSC
-        sw      zero, ll_bit
-#endif
         mfc0    t1, CP0_STATUS
         LONG_S  t1, THREAD_STATUS(a0)
         cpu_save_nonscratch a0
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S
index 656bde2e11b1..698414b7a253 100644
--- a/arch/mips/kernel/r2300_switch.S
+++ b/arch/mips/kernel/r2300_switch.S
@@ -46,9 +46,6 @@
  *                     struct thread_info *next_ti) )
  */
 LEAF(resume)
-#ifndef CONFIG_CPU_HAS_LLSC
-        sw      zero, ll_bit
-#endif
         mfc0    t1, CP0_STATUS
         sw      t1, THREAD_STATUS(a0)
         cpu_save_nonscratch a0
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index d9bfae53c43f..8893ee1a2368 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -45,9 +45,6 @@
  */
         .align  5
         LEAF(resume)
-#ifndef CONFIG_CPU_HAS_LLSC
-        sw      zero, ll_bit
-#endif
         mfc0    t1, CP0_STATUS
         LONG_S  t1, THREAD_STATUS(a0)
         cpu_save_nonscratch a0