Blackfin: merge Philippe's recent ipipe patch

ipipe-2.6.28.9-blackfin-git95aafe6.patch

Singed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
index a5de8d45424c..5fc424803a17 100644
--- a/arch/blackfin/kernel/ipipe.c
+++ b/arch/blackfin/kernel/ipipe.c
@@ -167,7 +167,7 @@ int __ipipe_check_root(void)
 void __ipipe_enable_irqdesc(struct ipipe_domain *ipd, unsigned irq)
 {
         struct irq_desc *desc = irq_to_desc(irq);
-        int prio = desc->ic_prio;
+        int prio = __ipipe_get_irq_priority(irq);
 
         desc->depth = 0;
         if (ipd != &ipipe_root &&
@@ -178,8 +178,7 @@ EXPORT_SYMBOL(__ipipe_enable_irqdesc);
 
 void __ipipe_disable_irqdesc(struct ipipe_domain *ipd, unsigned irq)
 {
-        struct irq_desc *desc = irq_to_desc(irq);
-        int prio = desc->ic_prio;
+        int prio = __ipipe_get_irq_priority(irq);
 
         if (ipd != &ipipe_root &&
             atomic_dec_and_test(&__ipipe_irq_lvdepth[prio]))
@@ -310,12 +309,16 @@ int ipipe_trigger_irq(unsigned irq)
 
 asmlinkage void __ipipe_sync_root(void)
 {
+        void (*irq_tail_hook)(void) = (void (*)(void))__ipipe_irq_tail_hook;
         unsigned long flags;
 
         BUG_ON(irqs_disabled());
 
         local_irq_save_hw(flags);
 
+        if (irq_tail_hook)
+                irq_tail_hook();
+
         clear_thread_flag(TIF_IRQ_SYNC);
 
         if (ipipe_root_cpudom_var(irqpend_himask) != 0)