Blackfin arch: merge adeos blackfin part to arch/blackfin/

[Mike Frysinger <vapier.adi@gmail.com>:
 - handle bf531/bf532/bf534/bf536 variants in ipipe.h
 - cleanup IPIPE logic for bfin_set_irq_handler()
 - cleanup ipipe asm code a bit and add missing ENDPROC()
 - simplify IPIPE code in trap_c
 - unify some of the IPIPE code and fix style
 - simplify DO_IRQ_L1 handling with ipipe code
 - revert IRQ_SW_INT# addition from ipipe merge
 - remove duplicate get_{c,s}clk() prototypes
]

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h
index 9964e17232e9..21b036eadab1 100644
--- a/arch/blackfin/include/asm/bitops.h
+++ b/arch/blackfin/include/asm/bitops.h
@@ -90,9 +90,9 @@ static inline void set_bit(int nr, volatile unsigned long *addr)
         unsigned long flags;
         a += nr >> 5;
         mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
+        local_irq_save_hw(flags);
         *a |= mask;
-        local_irq_restore(flags);
+        local_irq_restore_hw(flags);
 }
 
 static inline void clear_bit(int nr, volatile unsigned long *addr)
@@ -102,9 +102,9 @@ static inline void clear_bit(int nr, volatile unsigned long *addr)
         unsigned long flags;
         a += nr >> 5;
         mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
+        local_irq_save_hw(flags);
         *a &= ~mask;
-        local_irq_restore(flags);
+        local_irq_restore_hw(flags);
 }
 
 static inline void change_bit(int nr, volatile unsigned long *addr)
@@ -114,9 +114,9 @@ static inline void change_bit(int nr, volatile unsigned long *addr)
 
         ADDR += nr >> 5;
         mask = 1 << (nr & 31);
-        local_irq_save(flags);
+        local_irq_save_hw(flags);
         *ADDR ^= mask;
-        local_irq_restore(flags);
+        local_irq_restore_hw(flags);
 }
 
 static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
@@ -127,10 +127,10 @@ static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
 
         a += nr >> 5;
         mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
+        local_irq_save_hw(flags);
         retval = (mask & *a) != 0;
         *a |= mask;
-        local_irq_restore(flags);
+        local_irq_restore_hw(flags);
 
         return retval;
 }
@@ -143,10 +143,10 @@ static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)
 
         a += nr >> 5;
         mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
+        local_irq_save_hw(flags);
         retval = (mask & *a) != 0;
         *a &= ~mask;
-        local_irq_restore(flags);
+        local_irq_restore_hw(flags);
 
         return retval;
 }
@@ -159,10 +159,10 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
 
         a += nr >> 5;
         mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
+        local_irq_save_hw(flags);
         retval = (mask & *a) != 0;
         *a ^= mask;
-        local_irq_restore(flags);
+        local_irq_restore_hw(flags);
         return retval;
 }