Title: [9852] trunk/arch/blackfin/mach-common/ints-priority.c: Blackfin: ints-priority: tweak style to fix building on newer parts, and add back dpmc.h for PM code
- Revision
- 9852
- Author
- vapier
- Date
- 2011-04-15 14:14:42 -0400 (Fri, 15 Apr 2011)
Log Message
Blackfin: ints-priority: tweak style to fix building on newer parts, and add back dpmc.h for PM code
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-common/ints-priority.c (9851 => 9852)
--- trunk/arch/blackfin/mach-common/ints-priority.c 2011-04-15 18:03:52 UTC (rev 9851)
+++ trunk/arch/blackfin/mach-common/ints-priority.c 2011-04-15 18:14:42 UTC (rev 9852)
@@ -23,6 +23,7 @@
#include <asm/blackfin.h>
#include <asm/gpio.h>
#include <asm/irq_handler.h>
+#include <asm/dpmc.h>
#define SIC_SYSIRQ(irq) (irq - (IRQ_CORETMR + 1))
@@ -134,10 +135,8 @@
void bfin_internal_mask_irq(unsigned int irq)
{
- unsigned long flags;
+ unsigned long flags = hard_local_irq_save();
- flags = hard_local_irq_save();
-
#ifdef SIC_IMASK0
unsigned mask_bank = SIC_SYSIRQ(irq) / 32;
unsigned mask_bit = SIC_SYSIRQ(irq) % 32;
@@ -167,10 +166,8 @@
void bfin_internal_unmask_irq(unsigned int irq)
#endif
{
- unsigned long flags;
+ unsigned long flags = hard_local_irq_save();
- flags = hard_local_irq_save();
-
#ifdef SIC_IMASK0
unsigned mask_bank = SIC_SYSIRQ(irq) / 32;
unsigned mask_bit = SIC_SYSIRQ(irq) % 32;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
