leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xtensa: use NO_SYSCALL instead of -1

Browse Source 
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>
This commit is contained in:
Max Filippov 2018-11-09 15:43:14 -08:00
parent 98c3115a4e
commit 6a986984b6
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/xtensa/include/asm/ptrace.h
View File

@ -39,6 +39,8 @@
* +-----------------------+ --------
*/
#define NO_SYSCALL (-1)
#ifndef __ASSEMBLY__
#include <asm/coprocessor.h>

2
arch/xtensa/kernel/entry.S
View File

@ -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

2
arch/xtensa/kernel/ptrace.c
View File

@ -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];
}

8
arch/xtensa/kernel/signal.c
View File

@ -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
@ -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.. */
@ -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: