mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes for build and function regression. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJfZPE8AAoJELcQ+SIFb8Ha05wH/0pr6w81AZCDto8e0HEGYJG8
 He2P5wYd573N6trWH5RIxESeHp95MnWvqUnx/vziDs3yRiYyHl1ol5YLK7x2EdYZ
 8/FFvlayP3sjN6heUsGVGhZVZUDCSqrejN/HcL1kbGUc0bEcuzwKJ1qY8tWdf26C
 jt+aX4tgdzL02ZMn7glmn1u8vlvE31ghb1vGmPIlr7M5LaQEqpjM0F9RbcMrN7GI
 PZrF8tC8kA4FF8L349mvawBzHCMGGV3GzCDtUUyrYgKzkEQo/I3C/JgDFZloneGI
 gU1G8QxUV9uVHHpYut1+vPWfn/SmZeOLxrW8ABf4EXD2KF7D2RWihxGLUNO+p0g=
 =PMC1
 -----END PGP SIGNATURE-----

Merge tag 'sh-for-5.9-part2' of git://git.libc.org/linux-sh

Pull arch/sh fixes from Rich Felker:
 "Fixes for build and function regression"

* tag 'sh-for-5.9-part2' of git://git.libc.org/linux-sh:
  sh: fix syscall tracing
  sh: remove spurious circular inclusion from asm/smp.h
This commit is contained in:
Linus Torvalds 2020-09-18 11:59:15 -07:00
parent 69828c475d b0cfc315ff
commit 92ab97adee
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sh/include/asm/smp.h
View File

@ -8,7 +8,6 @@
#ifdef CONFIG_SMP
#include <linux/spinlock.h>
#include <linux/atomic.h>
#include <asm/current.h>
#include <asm/percpu.h>

1
arch/sh/kernel/entry-common.S
View File

@ -370,7 +370,6 @@ syscall_trace_entry:
nop
cmp/eq #-1, r0
bt syscall_exit
mov.l r0, @(OFF_R0,r15) ! Save return value
! Reload R0-R4 from kernel stack, where the
! parent may have modified them using
! ptrace(POKEUSR). (Note that R0-R2 are

15
arch/sh/kernel/ptrace_32.c
View File

@ -455,16 +455,11 @@ long arch_ptrace(struct task_struct *child, long request,
asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
{
long ret = 0;
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
/*
* Tracing decided this syscall should not happen.
* We'll return a bogus call number to get an ENOSYS
* error, but leave the original number in regs->regs[0].
*/
ret = -1L;
tracehook_report_syscall_entry(regs)) {
regs->regs[0] = -ENOSYS;
return -1;
}
if (secure_computing() == -1)
return -1;
@ -475,7 +470,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
audit_syscall_entry(regs->regs[3], regs->regs[4], regs->regs[5],
regs->regs[6], regs->regs[7]);
return ret ?: regs->regs[0];
return 0;
}
asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)