Merge branch 'linus' into perf/urgent

[pandora-kernel.git] / arch / microblaze / kernel / entry-nommu.S

diff --git a/arch/microblaze/kernel/entry-nommu.S b/arch/microblaze/kernel/entry-nommu.S
index 8cc18cd..ca84368 100644 (file)
--- a/arch/microblaze/kernel/entry-nommu.S
+++ b/arch/microblaze/kernel/entry-nommu.S
@@ -588,3 +588,31 @@ sys_rt_sigsuspend_wrapper:
 #include "syscall_table.S"
 
 syscall_table_size=(.-sys_call_table)
+
+type_SYSCALL:
+       .ascii "SYSCALL\0"
+type_IRQ:
+       .ascii "IRQ\0"
+type_IRQ_PREEMPT:
+       .ascii "IRQ (PREEMPTED)\0"
+type_SYSCALL_PREEMPT:
+       .ascii " SYSCALL (PREEMPTED)\0"
+
+       /*
+        * Trap decoding for stack unwinder
+        * Tuples are (start addr, end addr, string)
+        * If return address lies on [start addr, end addr],
+        * unwinder displays 'string'
+        */
+
+       .align 4
+.global microblaze_trap_handlers
+microblaze_trap_handlers:
+       /* Exact matches come first */
+       .word ret_to_user  ; .word ret_to_user    ; .word type_SYSCALL
+       .word ret_from_intr; .word ret_from_intr  ; .word type_IRQ
+       /* Fuzzy matches go here */
+       .word ret_from_intr; .word no_intr_resched; .word type_IRQ_PREEMPT
+       .word work_pending ; .word no_work_pending; .word type_SYSCALL_PREEMPT
+       /* End of table */
+       .word 0             ; .word 0               ; .word 0