Skip to content

Commit

Permalink
xtensa: use NO_SYSCALL instead of -1
Browse files Browse the repository at this point in the history
For the sake of clarity define macro NO_SYSCALL and use it for
setting/checking struct pt_regs::syscall field.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
  • Loading branch information
Max Filippov committed Dec 17, 2018
1 parent 98c3115 commit 6a98698
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions arch/xtensa/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
* +-----------------------+ --------
*/

#define NO_SYSCALL (-1)

#ifndef __ASSEMBLY__

#include <asm/coprocessor.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ common_exception:
s32i a2, a1, PT_DEBUGCAUSE
s32i a3, a1, PT_PC

movi a2, -1
movi a2, NO_SYSCALL
rsr a3, excvaddr
s32i a2, a1, PT_SYSCALL
movi a2, 0
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ unsigned long do_syscall_trace_enter(struct pt_regs *regs)
{
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
return -1;
return NO_SYSCALL;

return regs->areg[2];
}
Expand Down
8 changes: 4 additions & 4 deletions arch/xtensa/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@ restore_sigcontext(struct pt_regs *regs, struct rt_sigframe __user *frame)
COPY(sar);
#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->windowbase = 0;
regs->windowstart = 1;

regs->syscall = -1; /* disable syscall checks */
regs->syscall = NO_SYSCALL; /* disable syscall checks */

/* For PS, restore only PS.CALLINC.
* Assume that all other bits are either the same as for the signal
Expand Down Expand Up @@ -423,7 +423,7 @@ static void do_signal(struct pt_regs *regs)

/* Are we from a system call? */

if ((signed)regs->syscall >= 0) {
if (regs->syscall != NO_SYSCALL) {

/* If so, check system call restarting.. */

Expand Down Expand Up @@ -462,7 +462,7 @@ static void do_signal(struct pt_regs *regs)
}

/* Did we come from a system call? */
if ((signed) regs->syscall >= 0) {
if (regs->syscall != NO_SYSCALL) {
/* Restart the system call - no handlers present */
switch (regs->areg[2]) {
case -ERESTARTNOHAND:
Expand Down

0 comments on commit 6a98698

Please sign in to comment.