Blackfin arch: rename irq_flags to bfin_irq_flags

rename irq_flags to bfin_irq_flags to avoid namespace
collision with common code

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

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/blackfin/include/asm/context.S b/arch/blackfin/include/asm/context.S
index 40d20b4a9b1f..9ce21f68e914 100644
--- a/arch/blackfin/include/asm/context.S
+++ b/arch/blackfin/include/asm/context.S
@@ -307,8 +307,8 @@
         GET_PDA(p0, r0);
         r0 = [p0 + PDA_IRQFLAGS];
 #else
-        p0.h = _irq_flags;
-        p0.l = _irq_flags;
+        p0.h = _bfin_irq_flags;
+        p0.l = _bfin_irq_flags;
         r0 = [p0];
 #endif
         sti r0;
diff --git a/arch/blackfin/include/asm/irq.h b/arch/blackfin/include/asm/irq.h
index e43c20583fcd..21e25f778a63 100644
--- a/arch/blackfin/include/asm/irq.h
+++ b/arch/blackfin/include/asm/irq.h
@@ -49,16 +49,16 @@ static __inline__ int irq_canonicalize(int irq)
 /* Forward decl needed due to cdef inter dependencies */
 static inline uint32_t __pure bfin_dspid(void);
 # define blackfin_core_id() (bfin_dspid() & 0xff)
-# define irq_flags cpu_pda[blackfin_core_id()].imask
+# define bfin_irq_flags cpu_pda[blackfin_core_id()].imask
 #else
-extern unsigned long irq_flags;
+extern unsigned long bfin_irq_flags;
 #endif
 
 #define local_irq_enable() \
         __asm__ __volatile__( \
                 "sti %0;" \
                 : \
-                : "d" (irq_flags) \
+                : "d" (bfin_irq_flags) \
         )
 
 #define idle_with_irq_disabled() \
@@ -68,7 +68,7 @@ extern unsigned long irq_flags;
                 "sti %0;" \
                 "idle;" \
                 : \
-                : "d" (irq_flags) \
+                : "d" (bfin_irq_flags) \
         )
 
 #ifdef CONFIG_DEBUG_HWERR