mn10300: add cc clobbers to asm statements

gcc 4.2.1 for MN10300 is more agressive than the older gcc in
reordering/moving other insns between an insn that sets flags and an insn
that uses those flags.  This leads to trouble with asm statements which
are missing an explicit "cc" clobber.  This patch adds the explicit "cc"
clobber to asm statements which do indeed clobber the condition flags.

Signed-off-by: Mark Salter <msalter@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

5 files changed, 8 insertions, 5 deletions

diff --git a/arch/mn10300/include/asm/bitops.h b/arch/mn10300/include/asm/bitops.h
index 0b610f482abb..f49ac49e09ad 100644
--- a/arch/mn10300/include/asm/bitops.h
+++ b/arch/mn10300/include/asm/bitops.h
@@ -165,7 +165,7 @@ static inline __attribute__((const))
 unsigned long __ffs(unsigned long x)
 {
         int bit;
-        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(x & -x));
+        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(x & -x) : "cc");
         return bit;
 }
 
@@ -177,7 +177,7 @@ static inline __attribute__((const))
 int __ilog2_u32(u32 n)
 {
         int bit;
-        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(n));
+        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(n) : "cc");
         return bit;
 }
 
diff --git a/arch/mn10300/include/asm/div64.h b/arch/mn10300/include/asm/div64.h
index 3a8329b3e869..34dcb8e68309 100644
--- a/arch/mn10300/include/asm/div64.h
+++ b/arch/mn10300/include/asm/div64.h
@@ -72,6 +72,7 @@ unsigned __muldiv64u(unsigned val, unsigned mult, unsigned div)
                                          * MDR = MDR:val%div */
             : "=r"(result)
             : "0"(val), "ir"(mult), "r"(div)
+            : "cc"
             );
 
         return result;
@@ -92,6 +93,7 @@ signed __muldiv64s(signed val, signed mult, signed div)
                                          * MDR = MDR:val%div */
             : "=r"(result)
             : "0"(val), "ir"(mult), "r"(div)
+            : "cc"
             );
 
         return result;
diff --git a/arch/mn10300/include/asm/system.h b/arch/mn10300/include/asm/system.h
index 8214fb7e7fe4..3636c054dcd5 100644
--- a/arch/mn10300/include/asm/system.h
+++ b/arch/mn10300/include/asm/system.h
@@ -143,6 +143,7 @@ do {									\
                 "       mov     %0,epsw         \n"                     \
                 : "=&d"(tmp)                                            \
                 : "i"(~EPSW_IM), "r"(__mn10300_irq_enabled_epsw)        \
+                : "cc"                                                  \
                 );                                                      \
 } while (0)
 
diff --git a/arch/mn10300/include/asm/tlbflush.h b/arch/mn10300/include/asm/tlbflush.h
index e0239865abcb..1a7e29281c5d 100644
--- a/arch/mn10300/include/asm/tlbflush.h
+++ b/arch/mn10300/include/asm/tlbflush.h
@@ -22,7 +22,7 @@ do {								\
                  "      mov %0,%1               \n"             \
                  : "=d"(w)                                      \
                  : "m"(MMUCTR), "i"(MMUCTR_IIV|MMUCTR_DIV)      \
-                 : "memory"                                     \
+                 : "cc", "memory"                               \
                  );                                             \
 } while (0)
 
diff --git a/arch/mn10300/include/asm/uaccess.h b/arch/mn10300/include/asm/uaccess.h
index 167e10ff06d9..197a7af3dd8a 100644
--- a/arch/mn10300/include/asm/uaccess.h
+++ b/arch/mn10300/include/asm/uaccess.h
@@ -316,7 +316,7 @@ do {									\
                         "       .previous\n"                            \
                         : "=a"(__from), "=a"(__to), "=r"(size), "=&r"(w)\
                         : "0"(__from), "1"(__to), "2"(size)             \
-                        : "memory");                                    \
+                        : "cc", "memory");                              \
         }                                                               \
 } while (0)
 
@@ -352,7 +352,7 @@ do {									\
                         "       .previous\n"                            \
                         : "=a"(__from), "=a"(__to), "=r"(size), "=&r"(w)\
                         : "0"(__from), "1"(__to), "2"(size)             \
-                        : "memory");                                    \
+                        : "cc", "memory");                              \
         }                                                               \
 } while (0)