1 files changed, 20 insertions, 4 deletions

diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h
index 3afadefe335f..3ec89f467ac3 100644
--- a/arch/arc/include/asm/ptrace.h
+++ b/arch/arc/include/asm/ptrace.h
@@ -50,7 +50,17 @@ struct pt_regs {
         long r0;
         long sp;        /* user/kernel sp depending on where we came from  */
         long orig_r0;
-        long orig_r8;   /*to distinguish bet excp, sys call, int1 or int2 */
+
+        /*to distinguish bet excp, syscall, irq */
+        union {
+#ifdef CONFIG_CPU_BIG_ENDIAN
+                /* so that assembly code is same for LE/BE */
+                unsigned long orig_r8:16, event:16;
+#else
+                unsigned long event:16, orig_r8:16;
+#endif
+                long orig_r8_word;
+        };
 };
 
 /* Callee saved registers - need to be saved only when you are scheduled out */
@@ -87,9 +97,8 @@ struct callee_regs {
         sp;                     \
 })
 
-/* return 1 if in syscall, 0 if Intr or Exception */
-#define in_syscall(regs) (((regs->orig_r8) >= 0 && \
-                           (regs->orig_r8 <= NR_syscalls)) ? 1 : 0)
+#define in_syscall(regs)    (regs->event & orig_r8_IS_SCALL)
+#define in_brkpt_trap(regs) (regs->event & orig_r8_IS_BRKPT)
 
 #define current_pt_regs()                                       \
 ({                                                              \
@@ -101,6 +110,13 @@ struct callee_regs {
 
 #endif /* !__ASSEMBLY__ */
 
+#define orig_r8_IS_SCALL                0x0001
+#define orig_r8_IS_SCALL_RESTARTED      0x0002
+#define orig_r8_IS_BRKPT                0x0004
+#define orig_r8_IS_EXCPN                0x0004
+#define orig_r8_IS_IRQ1                 0x0010
+#define orig_r8_IS_IRQ2                 0x0020
+
 #endif /* __KERNEL__ */
 
 #ifndef __ASSEMBLY__