diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-11-18 04:48:22 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-11-18 04:48:22 -0500 |
commit | 400597842452c02916a61a51f3154dd032c2d569 (patch) | |
tree | ccb11e389a940ee9d8aa5c7654afd73063bdc950 /arch/blackfin/mach-common/entry.S | |
parent | b60705765a635728187e5cea5f36914886675013 (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/mach-common/entry.S')
-rw-r--r-- | arch/blackfin/mach-common/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 5531f49c84e6..e22c0a5cf32d 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
@@ -922,8 +922,8 @@ _schedule_and_signal_from_int: | |||
922 | GET_PDA(p0, r0); /* Fetch current PDA (can't migrate to other CPU here) */ | 922 | GET_PDA(p0, r0); /* Fetch current PDA (can't migrate to other CPU here) */ |
923 | r0 = [p0 + PDA_IRQFLAGS]; | 923 | r0 = [p0 + PDA_IRQFLAGS]; |
924 | #else | 924 | #else |
925 | p0.l = _irq_flags; | 925 | p0.l = _bfin_irq_flags; |
926 | p0.h = _irq_flags; | 926 | p0.h = _bfin_irq_flags; |
927 | r0 = [p0]; | 927 | r0 = [p0]; |
928 | #endif | 928 | #endif |
929 | sti r0; | 929 | sti r0; |