Blackfin arch: merge adeos blackfin part to arch/blackfin/

[Mike Frysinger <vapier.adi@gmail.com>:
 - handle bf531/bf532/bf534/bf536 variants in ipipe.h
 - cleanup IPIPE logic for bfin_set_irq_handler()
 - cleanup ipipe asm code a bit and add missing ENDPROC()
 - simplify IPIPE code in trap_c
 - unify some of the IPIPE code and fix style
 - simplify DO_IRQ_L1 handling with ipipe code
 - revert IRQ_SW_INT# addition from ipipe merge
 - remove duplicate get_{c,s}clk() prototypes
]

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 950cc822fb75..956aefb84687 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -577,10 +577,15 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 }
         }
 
-        info.si_signo = sig;
-        info.si_errno = 0;
-        info.si_addr = (void __user *)fp->pc;
-        force_sig_info(sig, &info, current);
+#ifdef CONFIG_IPIPE
+        if (!ipipe_trap_notify(fp->seqstat & 0x3f, fp))
+#endif
+        {
+                info.si_signo = sig;
+                info.si_errno = 0;
+                info.si_addr = (void __user *)fp->pc;
+                force_sig_info(sig, &info, current);
+        }
 
         trace_buffer_restore(j);
         return;