diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 17:37:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 17:37:27 -0400 |
commit | e36f561a2c88394ef2708f1ab300fe8a79e9f651 (patch) | |
tree | 385f378c4240955e4356d49686a8ef606a82a7c1 /arch/blackfin/mach-common/pm.c | |
parent | 70ada77920723fbc2b35e9b301022fb1e166b41b (diff) | |
parent | df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:
Fix IRQ flag handling naming
MIPS: Add missing #inclusions of <linux/irq.h>
smc91x: Add missing #inclusion of <linux/irq.h>
Drop a couple of unnecessary asm/system.h inclusions
SH: Add missing consts to sys_execve() declaration
Blackfin: Rename IRQ flags handling functions
Blackfin: Add missing dep to asm/irqflags.h
Blackfin: Rename DES PC2() symbol to avoid collision
Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header
Blackfin: Split PLL code from mach-specific cdef headers
Diffstat (limited to 'arch/blackfin/mach-common/pm.c')
-rw-r--r-- | arch/blackfin/mach-common/pm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index 09c1fb410748..80884b136a0c 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c | |||
@@ -25,7 +25,7 @@ void bfin_pm_suspend_standby_enter(void) | |||
25 | { | 25 | { |
26 | unsigned long flags; | 26 | unsigned long flags; |
27 | 27 | ||
28 | local_irq_save_hw(flags); | 28 | flags = hard_local_irq_save(); |
29 | bfin_pm_standby_setup(); | 29 | bfin_pm_standby_setup(); |
30 | 30 | ||
31 | #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER | 31 | #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER |
@@ -56,7 +56,7 @@ void bfin_pm_suspend_standby_enter(void) | |||
56 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); | 56 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | local_irq_restore_hw(flags); | 59 | hard_local_irq_restore(flags); |
60 | } | 60 | } |
61 | 61 | ||
62 | int bf53x_suspend_l1_mem(unsigned char *memptr) | 62 | int bf53x_suspend_l1_mem(unsigned char *memptr) |
@@ -149,12 +149,12 @@ int bfin_pm_suspend_mem_enter(void) | |||
149 | wakeup |= GPWE; | 149 | wakeup |= GPWE; |
150 | #endif | 150 | #endif |
151 | 151 | ||
152 | local_irq_save_hw(flags); | 152 | flags = hard_local_irq_save(); |
153 | 153 | ||
154 | ret = blackfin_dma_suspend(); | 154 | ret = blackfin_dma_suspend(); |
155 | 155 | ||
156 | if (ret) { | 156 | if (ret) { |
157 | local_irq_restore_hw(flags); | 157 | hard_local_irq_restore(flags); |
158 | kfree(memptr); | 158 | kfree(memptr); |
159 | return ret; | 159 | return ret; |
160 | } | 160 | } |
@@ -178,7 +178,7 @@ int bfin_pm_suspend_mem_enter(void) | |||
178 | bfin_gpio_pm_hibernate_restore(); | 178 | bfin_gpio_pm_hibernate_restore(); |
179 | blackfin_dma_resume(); | 179 | blackfin_dma_resume(); |
180 | 180 | ||
181 | local_irq_restore_hw(flags); | 181 | hard_local_irq_restore(flags); |
182 | kfree(memptr); | 182 | kfree(memptr); |
183 | 183 | ||
184 | return 0; | 184 | return 0; |