block: integrity flags can't use bit ops on unsigned short

[cascardo/linux.git] / include / asm-blackfin / blackfin.h

diff --git a/include/asm-blackfin/blackfin.h b/include/asm-blackfin/blackfin.h
index 1b2dd5a..984b74f 100644 (file)
--- a/include/asm-blackfin/blackfin.h
+++ b/include/asm-blackfin/blackfin.h
@@ -11,8 +11,7 @@
 #define HI(con32) (((con32) >> 16) & 0xFFFF)
 #define hi(con32) (((con32) >> 16) & 0xFFFF)
 
-#include <asm/mach/blackfin.h>
-#include <asm/bfin-global.h>
+#include <asm/mach/anomaly.h>
 
 #ifndef __ASSEMBLY__
 
@@ -20,7 +19,7 @@
 static inline void SSYNC(void)
 {
        int _tmp;
-       if (ANOMALY_05000312 && ANOMALY_05000244)
+       if (ANOMALY_05000312)
                __asm__ __volatile__(
                        "cli %0;"
                        "nop;"
@@ -29,14 +28,7 @@ static inline void SSYNC(void)
                        "sti %0;"
                        : "=d" (_tmp)
                );
-       else if (ANOMALY_05000312 && !ANOMALY_05000244)
-               __asm__ __volatile__(
-                       "cli %0;"
-                       "ssync;"
-                       "sti %0;"
-                       : "=d" (_tmp)
-               );
-       else if (!ANOMALY_05000312 && ANOMALY_05000244)
+       else if (ANOMALY_05000244)
                __asm__ __volatile__(
                        "nop;"
                        "nop;"
@@ -51,7 +43,7 @@ static inline void SSYNC(void)
 static inline void CSYNC(void)
 {
        int _tmp;
-       if (ANOMALY_05000312 && ANOMALY_05000244)
+       if (ANOMALY_05000312)
                __asm__ __volatile__(
                        "cli %0;"
                        "nop;"
@@ -60,19 +52,12 @@ static inline void CSYNC(void)
                        "sti %0;"
                        : "=d" (_tmp)
                );
-       else if (ANOMALY_05000312 && !ANOMALY_05000244)
-               __asm__ __volatile__(
-                       "cli %0;"
-                       "csync;"
-                       "sti %0;"
-                       : "=d" (_tmp)
-               );
-       else if (!ANOMALY_05000312 && ANOMALY_05000244)
+       else if (ANOMALY_05000244)
                __asm__ __volatile__(
                        "nop;"
                        "nop;"
                        "nop;"
-                       "ssync;"
+                       "csync;"
                );
        else
                __asm__ __volatile__("csync;");
@@ -85,19 +70,15 @@ static inline void CSYNC(void)
 #define ssync(x) SSYNC(x)
 #define csync(x) CSYNC(x)
 
-#if ANOMALY_05000312 && ANOMALY_05000244
+#if ANOMALY_05000312
 #define SSYNC(scratch) cli scratch; nop; nop; SSYNC; sti scratch;
 #define CSYNC(scratch) cli scratch; nop; nop; CSYNC; sti scratch;
 
-#elif ANOMALY_05000312 && !ANOMALY_05000244
-#define SSYNC(scratch) cli scratch; nop; nop; SSYNC; sti scratch;
-#define CSYNC(scratch) cli scratch; nop; nop; CSYNC; sti scratch;
-
-#elif !ANOMALY_05000312 && ANOMALY_05000244
+#elif ANOMALY_05000244
 #define SSYNC(scratch) nop; nop; nop; SSYNC;
 #define CSYNC(scratch) nop; nop; nop; CSYNC;
 
-#elif !ANOMALY_05000312 && !ANOMALY_05000244
+#else
 #define SSYNC(scratch) SSYNC;
 #define CSYNC(scratch) CSYNC;
 
@@ -105,4 +86,7 @@ static inline void CSYNC(void)
 
 #endif /* __ASSEMBLY__ */
 
+#include <asm/mach/blackfin.h>
+#include <asm/bfin-global.h>
+
 #endif                         /* _BLACKFIN_H_ */