Commit 6a986984 authored by Max Filippov's avatar Max Filippov

xtensa: use NO_SYSCALL instead of -1

For the sake of clarity define macro NO_SYSCALL and use it for
setting/checking struct pt_regs::syscall field.
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 98c3115a
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
* +-----------------------+ -------- * +-----------------------+ --------
*/ */
#define NO_SYSCALL (-1)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/coprocessor.h> #include <asm/coprocessor.h>
......
...@@ -364,7 +364,7 @@ common_exception: ...@@ -364,7 +364,7 @@ common_exception:
s32i a2, a1, PT_DEBUGCAUSE s32i a2, a1, PT_DEBUGCAUSE
s32i a3, a1, PT_PC s32i a3, a1, PT_PC
movi a2, -1 movi a2, NO_SYSCALL
rsr a3, excvaddr rsr a3, excvaddr
s32i a2, a1, PT_SYSCALL s32i a2, a1, PT_SYSCALL
movi a2, 0 movi a2, 0
......
...@@ -491,7 +491,7 @@ unsigned long do_syscall_trace_enter(struct pt_regs *regs) ...@@ -491,7 +491,7 @@ unsigned long do_syscall_trace_enter(struct pt_regs *regs)
{ {
if (test_thread_flag(TIF_SYSCALL_TRACE) && if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs)) tracehook_report_syscall_entry(regs))
return -1; return NO_SYSCALL;
return regs->areg[2]; return regs->areg[2];
} }
......
...@@ -185,13 +185,13 @@ restore_sigcontext(struct pt_regs *regs, struct rt_sigframe __user *frame) ...@@ -185,13 +185,13 @@ restore_sigcontext(struct pt_regs *regs, struct rt_sigframe __user *frame)
COPY(sar); COPY(sar);
#undef COPY #undef COPY
/* All registers were flushed to stack. Start with a prestine frame. */ /* All registers were flushed to stack. Start with a pristine frame. */
regs->wmask = 1; regs->wmask = 1;
regs->windowbase = 0; regs->windowbase = 0;
regs->windowstart = 1; regs->windowstart = 1;
regs->syscall = -1; /* disable syscall checks */ regs->syscall = NO_SYSCALL; /* disable syscall checks */
/* For PS, restore only PS.CALLINC. /* For PS, restore only PS.CALLINC.
* Assume that all other bits are either the same as for the signal * Assume that all other bits are either the same as for the signal
...@@ -423,7 +423,7 @@ static void do_signal(struct pt_regs *regs) ...@@ -423,7 +423,7 @@ static void do_signal(struct pt_regs *regs)
/* Are we from a system call? */ /* Are we from a system call? */
if ((signed)regs->syscall >= 0) { if (regs->syscall != NO_SYSCALL) {
/* If so, check system call restarting.. */ /* If so, check system call restarting.. */
...@@ -462,7 +462,7 @@ static void do_signal(struct pt_regs *regs) ...@@ -462,7 +462,7 @@ static void do_signal(struct pt_regs *regs)
} }
/* Did we come from a system call? */ /* Did we come from a system call? */
if ((signed) regs->syscall >= 0) { if (regs->syscall != NO_SYSCALL) {
/* Restart the system call - no handlers present */ /* Restart the system call - no handlers present */
switch (regs->areg[2]) { switch (regs->areg[2]) {
case -ERESTARTNOHAND: case -ERESTARTNOHAND:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment