Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fb51d566803413d2682ca718aef1c6f946fdab05
Commit: fb51d566803413d2682ca718aef1c6f946fdab05
Parent: 35c724f310c4b73dbfa6503a46bf86a4c55f8193
Author: Robin Getz <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 3 17:56:29 2007 +0800
Committer: Bryan Wu <[EMAIL PROTECTED]>
CommitDate: Fri Aug 3 17:56:29 2007 +0800
Blackfin arch: Fix Anomaly hanlding, as pointed out by Mike
Signed-off-by: Robin Getz <[EMAIL PROTECTED]>
Cc: Mike Frysinger <[EMAIL PROTECTED]>
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
include/asm-blackfin/blackfin.h | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/include/asm-blackfin/blackfin.h b/include/asm-blackfin/blackfin.h
index 3c6e597..984b74f 100644
--- a/include/asm-blackfin/blackfin.h
+++ b/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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
