1 files changed, 1 insertions, 23 deletions
diff --git a/arch/blackfin/include/asm/delay.h b/arch/blackfin/include/asm/delay.h
index 47f98c5067b5..c31f91cc1d5d 100644
--- a/arch/blackfin/include/asm/delay.h
+++ b/arch/blackfin/include/asm/delay.h
@@ -13,29 +13,7 @@
 static inline void __delay(unsigned long loops)
 {
-        if (ANOMALY_05000312) {
+__asm__ __volatile__ (
-                /* Interrupted loads to loop registers -> bad */
-                unsigned long tmp;
-                __asm__ __volatile__(
-                        "[--SP] = LC0;"
-                        "[--SP] = LT0;"
-                        "[--SP] = LB0;"
-                        "LSETUP (1f,1f) LC0 = %1;"
-                        "1: NOP;"
-                        /* We take advantage of the fact that LC0 is 0 at
-                         * the end of the loop.  Otherwise we'd need some
-                         * NOPs after the CLI here.
-                         */
-                        "CLI %0;"
-                        "LB0 = [SP++];"
-                        "LT0 = [SP++];"
-                        "LC0 = [SP++];"
-                        "STI %0;"
-                        : "=d" (tmp)
-                        : "a" (loops)
-                );
-        } else
-                __asm__ __volatile__ (
                        "LSETUP(1f, 1f) LC0 = %0;"
                        "1: NOP;"
                        :

diff --git a/arch/blackfin/include/asm/delay.h b/arch/blackfin/include/asm/delay.h index 47f98c5067b5..c31f91cc1d5d 100644 --- a/arch/blackfin/include/asm/delay.h +++ b/arch/blackfin/include/asm/delay.h
@@ -13,29 +13,7 @@
13		13
14	static inline void __delay(unsigned long loops)	14	static inline void __delay(unsigned long loops)
15	{	15	{
16	if (ANOMALY_05000312) {	16	__asm__ __volatile__ (
17	/* Interrupted loads to loop registers -> bad */
18	unsigned long tmp;
19	__asm__ __volatile__(
20	"[--SP] = LC0;"
21	"[--SP] = LT0;"
22	"[--SP] = LB0;"
23	"LSETUP (1f,1f) LC0 = %1;"
24	"1: NOP;"
25	/* We take advantage of the fact that LC0 is 0 at
26	* the end of the loop. Otherwise we'd need some
27	* NOPs after the CLI here.
28	*/
29	"CLI %0;"
30	"LB0 = [SP++];"
31	"LT0 = [SP++];"
32	"LC0 = [SP++];"
33	"STI %0;"
34	: "=d" (tmp)
35	: "a" (loops)
36	);
37	} else
38	__asm__ __volatile__ (
39	"LSETUP(1f, 1f) LC0 = %0;"	17	"LSETUP(1f, 1f) LC0 = %0;"
40	"1: NOP;"	18	"1: NOP;"
41	:	19	: