diff options
Diffstat (limited to 'arch/blackfin/include/asm/ipipe.h')
-rw-r--r-- | arch/blackfin/include/asm/ipipe.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h index d3b40449ca0e..40f94a704c02 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h | |||
@@ -49,7 +49,7 @@ | |||
49 | #define prepare_arch_switch(next) \ | 49 | #define prepare_arch_switch(next) \ |
50 | do { \ | 50 | do { \ |
51 | ipipe_schedule_notify(current, next); \ | 51 | ipipe_schedule_notify(current, next); \ |
52 | local_irq_disable_hw(); \ | 52 | hard_local_irq_disable(); \ |
53 | } while (0) | 53 | } while (0) |
54 | 54 | ||
55 | #define task_hijacked(p) \ | 55 | #define task_hijacked(p) \ |
@@ -57,7 +57,7 @@ do { \ | |||
57 | int __x__ = __ipipe_root_domain_p; \ | 57 | int __x__ = __ipipe_root_domain_p; \ |
58 | __clear_bit(IPIPE_SYNC_FLAG, &ipipe_root_cpudom_var(status)); \ | 58 | __clear_bit(IPIPE_SYNC_FLAG, &ipipe_root_cpudom_var(status)); \ |
59 | if (__x__) \ | 59 | if (__x__) \ |
60 | local_irq_enable_hw(); \ | 60 | hard_local_irq_enable(); \ |
61 | !__x__; \ | 61 | !__x__; \ |
62 | }) | 62 | }) |
63 | 63 | ||
@@ -167,7 +167,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul) | |||
167 | #define __ipipe_run_isr(ipd, irq) \ | 167 | #define __ipipe_run_isr(ipd, irq) \ |
168 | do { \ | 168 | do { \ |
169 | if (!__ipipe_pipeline_head_p(ipd)) \ | 169 | if (!__ipipe_pipeline_head_p(ipd)) \ |
170 | local_irq_enable_hw(); \ | 170 | hard_local_irq_enable(); \ |
171 | if (ipd == ipipe_root_domain) { \ | 171 | if (ipd == ipipe_root_domain) { \ |
172 | if (unlikely(ipipe_virtual_irq_p(irq))) { \ | 172 | if (unlikely(ipipe_virtual_irq_p(irq))) { \ |
173 | irq_enter(); \ | 173 | irq_enter(); \ |
@@ -183,7 +183,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul) | |||
183 | __ipipe_run_irqtail(); \ | 183 | __ipipe_run_irqtail(); \ |
184 | __set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \ | 184 | __set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \ |
185 | } \ | 185 | } \ |
186 | local_irq_disable_hw(); \ | 186 | hard_local_irq_disable(); \ |
187 | } while (0) | 187 | } while (0) |
188 | 188 | ||
189 | #define __ipipe_syscall_watched_p(p, sc) \ | 189 | #define __ipipe_syscall_watched_p(p, sc) \ |