---

yaml --- r: 65978 b: refs/heads/master c: fb51d56 h: refs/heads/master v: v3
git-mirror · Aug 3, 2007 · 83504f7 · 83504f7
1 parent abf25b7
commit 83504f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35c724f310c4b73dbfa6503a46bf86a4c55f8193
+refs/heads/master: fb51d566803413d2682ca718aef1c6f946fdab05
diff --git a/trunk/include/asm-blackfin/blackfin.h b/trunk/include/asm-blackfin/blackfin.h
@@ -19,7 +19,7 @@
 static inline void SSYNC(void)
 {
 	int _tmp;
-	if (ANOMALY_05000312 && ANOMALY_05000244)
+	if (ANOMALY_05000312)
 		__asm__ __volatile__(
 			"cli %0;"
 			"nop;"
@@ -28,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;"
@@ -50,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;"
@@ -59,14 +52,7 @@ 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;"
@@ -84,19 +70,15 @@ static inline void CSYNC(void)
 #define ssync(x) SSYNC(x)
 #define csync(x) CSYNC(x)
 
-#if 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
+#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
+#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;