aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include/asm/context.S
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2008-11-18 04:48:22 -0500
committerBryan Wu <cooloney@kernel.org>2008-11-18 04:48:22 -0500
commit400597842452c02916a61a51f3154dd032c2d569 (patch)
treeccb11e389a940ee9d8aa5c7654afd73063bdc950 /arch/blackfin/include/asm/context.S
parentb60705765a635728187e5cea5f36914886675013 (diff)
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>
Diffstat (limited to 'arch/blackfin/include/asm/context.S')
-rw-r--r--arch/blackfin/include/asm/context.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/context.S b/arch/blackfin/include/asm/context.S
index 40d20b4a9b1..9ce21f68e91 100644
--- a/arch/blackfin/include/asm/context.S
+++ b/arch/blackfin/include/asm/context.S
@@ -307,8 +307,8 @@
307 GET_PDA(p0, r0); 307 GET_PDA(p0, r0);
308 r0 = [p0 + PDA_IRQFLAGS]; 308 r0 = [p0 + PDA_IRQFLAGS];
309#else 309#else
310 p0.h = _irq_flags; 310 p0.h = _bfin_irq_flags;
311 p0.l = _irq_flags; 311 p0.l = _bfin_irq_flags;
312 r0 = [p0]; 312 r0 = [p0];
313#endif 313#endif
314 sti r0; 314 sti r0;