Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[pandora-kernel.git] / arch / blackfin / kernel / ipipe.c

diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
index 1a496cd..3b1da4a 100644 (file)
--- a/arch/blackfin/kernel/ipipe.c
+++ b/arch/blackfin/kernel/ipipe.c
@@ -219,10 +219,10 @@ int __ipipe_syscall_root(struct pt_regs *regs)
 
        ret = __ipipe_dispatch_event(IPIPE_EVENT_SYSCALL, regs);
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
 
        if (!__ipipe_root_domain_p) {
-               local_irq_restore_hw(flags);
+               hard_local_irq_restore(flags);
                return 1;
        }
 
@@ -230,7 +230,7 @@ int __ipipe_syscall_root(struct pt_regs *regs)
        if ((p->irqpend_himask & IPIPE_IRQMASK_VIRT) != 0)
                __ipipe_sync_pipeline(IPIPE_IRQMASK_VIRT);
 
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 
        return -ret;
 }
@@ -239,14 +239,14 @@ unsigned long ipipe_critical_enter(void (*syncfn) (void))
 {
        unsigned long flags;
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
 
        return flags;
 }
 
 void ipipe_critical_exit(unsigned long flags)
 {
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 }
 
 static void __ipipe_no_irqtail(void)
@@ -279,9 +279,9 @@ int ipipe_trigger_irq(unsigned irq)
                return -EINVAL;
 #endif
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
        __ipipe_handle_irq(irq, NULL);
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 
        return 1;
 }
@@ -293,7 +293,7 @@ asmlinkage void __ipipe_sync_root(void)
 
        BUG_ON(irqs_disabled());
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
 
        if (irq_tail_hook)
                irq_tail_hook();
@@ -303,7 +303,7 @@ asmlinkage void __ipipe_sync_root(void)
        if (ipipe_root_cpudom_var(irqpend_himask) != 0)
                __ipipe_sync_pipeline(IPIPE_IRQMASK_ANY);
 
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 }
 
 void ___ipipe_sync_pipeline(unsigned long syncmask)
@@ -344,10 +344,10 @@ void __ipipe_stall_root(void)
 {
        unsigned long *p, flags;
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        __set_bit(IPIPE_STALL_FLAG, p);
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_stall_root);
 
@@ -356,10 +356,10 @@ unsigned long __ipipe_test_and_stall_root(void)
        unsigned long *p, flags;
        int x;
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        x = __test_and_set_bit(IPIPE_STALL_FLAG, p);
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 
        return x;
 }
@@ -371,10 +371,10 @@ unsigned long __ipipe_test_root(void)
        unsigned long flags;
        int x;
 
-       local_irq_save_hw_smp(flags);
+       flags = hard_local_irq_save_smp();
        p = &__ipipe_root_status;
        x = test_bit(IPIPE_STALL_FLAG, p);
-       local_irq_restore_hw_smp(flags);
+       hard_local_irq_restore_smp(flags);
 
        return x;
 }
@@ -384,10 +384,10 @@ void __ipipe_lock_root(void)
 {
        unsigned long *p, flags;
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        __set_bit(IPIPE_SYNCDEFER_FLAG, p);
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_lock_root);
 
@@ -395,9 +395,9 @@ void __ipipe_unlock_root(void)
 {
        unsigned long *p, flags;
 
-       local_irq_save_hw(flags);
+       flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        __clear_bit(IPIPE_SYNCDEFER_FLAG, p);
-       local_irq_restore_hw(flags);
+       hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_unlock_root);