1 files changed, 51 insertions, 42 deletions
diff --git a/include/asm-blackfin/system.h b/include/asm-blackfin/system.h
index 5e5f1a0566c0..2b3d47d0bbb6 100644
--- a/include/asm-blackfin/system.h
+++ b/include/asm-blackfin/system.h
@@ -36,6 +36,7 @@
 #include <linux/linkage.h>
 #include <linux/compiler.h>
+#include <asm/mach/anomaly.h>
 /*
 * Interrupt configuring macros.
@@ -43,53 +44,60 @@
 extern unsigned long irq_flags;
-#define local_irq_enable() do {         \
+#define local_irq_enable() \
-        __asm__ __volatile__ (          \
+        __asm__ __volatile__( \
-                "sti %0;"               \
+                "sti %0;" \
-                ::"d"(irq_flags));      \
+                : \
-} while (0)
+                : "d" (irq_flags) \
+        )
-#define local_irq_disable() do {        \
+#define local_irq_disable() \
-        int _tmp_dummy;                 \
+        do { \
-        __asm__ __volatile__ (          \
+                int __tmp_dummy; \
-                "cli %0;"               \
+                __asm__ __volatile__( \
-                :"=d" (_tmp_dummy):);   \
+                        "cli %0;" \
-} while (0)
+                        : "=d" (__tmp_dummy) \
+                ); \
+        } while (0)
-#if defined(ANOMALY_05000244) && defined (CONFIG_BLKFIN_CACHE)
+#if ANOMALY_05000244 && defined(CONFIG_BFIN_ICACHE)
-#define idle_with_irq_disabled() do {   \
+# define NOP_PAD_ANOMALY_05000244 "nop; nop;"
-        __asm__ __volatile__ (          \
-                "nop; nop;\n"           \
-                ".align 8;\n"           \
-                "sti %0; idle;\n"       \
-                ::"d" (irq_flags));     \
-} while (0)
 #else
-#define idle_with_irq_disabled() do {   \
+# define NOP_PAD_ANOMALY_05000244
-        __asm__ __volatile__ (          \
-                ".align 8;\n"           \
-                "sti %0; idle;\n"       \
-                ::"d" (irq_flags));     \
-} while (0)
 #endif
+#define idle_with_irq_disabled() \
+        __asm__ __volatile__( \
+                NOP_PAD_ANOMALY_05000244 \
+                ".align 8;" \
+                "sti %0;" \
+                "idle;" \
+                : \
+                : "d" (irq_flags) \
+        )
 #ifdef CONFIG_DEBUG_HWERR
-#define __save_and_cli(x) do {                  \
+# define __save_and_cli(x) \
-        __asm__ __volatile__ (                  \
+        __asm__ __volatile__( \
-                "cli %0;\n\tsti %1;"            \
+                "cli %0;" \
-                :"=&d"(x): "d" (0x3F));         \
+                "sti %1;" \
-} while (0)
+                : "=&d" (x) \
+                : "d" (0x3F) \
+        )
 #else
-#define __save_and_cli(x) do {          \
+# define __save_and_cli(x) \
-        __asm__ __volatile__ (          \
+        __asm__ __volatile__( \
-                "cli %0;"               \
+                "cli %0;" \
-                :"=&d"(x):);            \
+                : "=&d" (x) \
-} while (0)
+        )
 #endif
-#define local_save_flags(x) asm volatile ("cli %0;"     \
+#define local_save_flags(x) \
-                                          "sti %0;"     \
+        __asm__ __volatile__( \
-                                          :"=d"(x):);
+                "cli %0;" \
+                "sti %0;" \
+                : "=d" (x) \
+        )
 #ifdef CONFIG_DEBUG_HWERR
 #define irqs_enabled_from_flags(x) (((x) & ~0x3f) != 0)
@@ -97,10 +105,11 @@ extern unsigned long irq_flags;
 #define irqs_enabled_from_flags(x) ((x) != 0x1f)
 #endif
-#define local_irq_restore(x) do {                       \
+#define local_irq_restore(x) \
-        if (irqs_enabled_from_flags(x))                 \
+        do { \
-                local_irq_enable ();                    \
+                if (irqs_enabled_from_flags(x)) \
-} while (0)
+                        local_irq_enable(); \
+        } while (0)
 /* For spinlocks etc */
 #define local_irq_save(x) __save_and_cli(x)

diff --git a/include/asm-blackfin/system.h b/include/asm-blackfin/system.h index 5e5f1a0566c0..2b3d47d0bbb6 100644 --- a/include/asm-blackfin/system.h +++ b/include/asm-blackfin/system.h
@@ -36,6 +36,7 @@
36		36
37	#include <linux/linkage.h>	37	#include <linux/linkage.h>
38	#include <linux/compiler.h>	38	#include <linux/compiler.h>
		39	#include <asm/mach/anomaly.h>
39		40
40	/*	41	/*
41	* Interrupt configuring macros.	42	* Interrupt configuring macros.
@@ -43,53 +44,60 @@
43		44
44	extern unsigned long irq_flags;	45	extern unsigned long irq_flags;
45		46
46	#define local_irq_enable() do { \	47	#define local_irq_enable() \
47	__asm__ __volatile__ ( \	48	__asm__ __volatile__( \
48	"sti %0;" \	49	"sti %0;" \
49	::"d"(irq_flags)); \	50	: \
50	} while (0)	51	: "d" (irq_flags) \
		52	)
51		53
52	#define local_irq_disable() do { \	54	#define local_irq_disable() \
53	int _tmp_dummy; \	55	do { \
54	__asm__ __volatile__ ( \	56	int __tmp_dummy; \
55	"cli %0;" \	57	__asm__ __volatile__( \
56	:"=d" (_tmp_dummy):); \	58	"cli %0;" \
57	} while (0)	59	: "=d" (__tmp_dummy) \
		60	); \
		61	} while (0)
58		62
59	#if defined(ANOMALY_05000244) && defined (CONFIG_BLKFIN_CACHE)	63	#if ANOMALY_05000244 && defined(CONFIG_BFIN_ICACHE)
60	#define idle_with_irq_disabled() do { \	64	# define NOP_PAD_ANOMALY_05000244 "nop; nop;"
61	__asm__ __volatile__ ( \
62	"nop; nop;\n" \
63	".align 8;\n" \
64	"sti %0; idle;\n" \
65	::"d" (irq_flags)); \
66	} while (0)
67	#else	65	#else
68	#define idle_with_irq_disabled() do { \	66	# define NOP_PAD_ANOMALY_05000244
69	__asm__ __volatile__ ( \
70	".align 8;\n" \
71	"sti %0; idle;\n" \
72	::"d" (irq_flags)); \
73	} while (0)
74	#endif	67	#endif
75		68
		69	#define idle_with_irq_disabled() \
		70	__asm__ __volatile__( \
		71	NOP_PAD_ANOMALY_05000244 \
		72	".align 8;" \
		73	"sti %0;" \
		74	"idle;" \
		75	: \
		76	: "d" (irq_flags) \
		77	)
		78
76	#ifdef CONFIG_DEBUG_HWERR	79	#ifdef CONFIG_DEBUG_HWERR
77	#define __save_and_cli(x) do { \	80	# define __save_and_cli(x) \
78	__asm__ __volatile__ ( \	81	__asm__ __volatile__( \
79	"cli %0;\n\tsti %1;" \	82	"cli %0;" \
80	:"=&d"(x): "d" (0x3F)); \	83	"sti %1;" \
81	} while (0)	84	: "=&d" (x) \
		85	: "d" (0x3F) \
		86	)
82	#else	87	#else
83	#define __save_and_cli(x) do { \	88	# define __save_and_cli(x) \
84	__asm__ __volatile__ ( \	89	__asm__ __volatile__( \
85	"cli %0;" \	90	"cli %0;" \
86	:"=&d"(x):); \	91	: "=&d" (x) \
87	} while (0)	92	)
88	#endif	93	#endif
89		94
90	#define local_save_flags(x) asm volatile ("cli %0;" \	95	#define local_save_flags(x) \
91	"sti %0;" \	96	__asm__ __volatile__( \
92	:"=d"(x):);	97	"cli %0;" \
		98	"sti %0;" \
		99	: "=d" (x) \
		100	)
93		101
94	#ifdef CONFIG_DEBUG_HWERR	102	#ifdef CONFIG_DEBUG_HWERR
95	#define irqs_enabled_from_flags(x) (((x) & ~0x3f) != 0)	103	#define irqs_enabled_from_flags(x) (((x) & ~0x3f) != 0)
@@ -97,10 +105,11 @@ extern unsigned long irq_flags;
97	#define irqs_enabled_from_flags(x) ((x) != 0x1f)	105	#define irqs_enabled_from_flags(x) ((x) != 0x1f)
98	#endif	106	#endif
99		107
100	#define local_irq_restore(x) do { \	108	#define local_irq_restore(x) \
101	if (irqs_enabled_from_flags(x)) \	109	do { \
102	local_irq_enable (); \	110	if (irqs_enabled_from_flags(x)) \
103	} while (0)	111	local_irq_enable(); \
		112	} while (0)
104		113
105	/* For spinlocks etc */	114	/* For spinlocks etc */
106	#define local_irq_save(x) __save_and_cli(x)	115	#define local_irq_save(x) __save_and_cli(x)