summaryrefslogtreecommitdiffstats
path: root/arch/csky/kernel/signal.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-28 22:22:40 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-07-28 22:22:40 +0200
commit7a30bdd99f37352b188575b27924c407c6ddff9e (patch)
tree10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /arch/csky/kernel/signal.c
parentf36cf386e3fec258a341d446915862eded3e13d8 (diff)
parent609488bc979f99f805f34e9a32c1e3b71179d10b (diff)
downloadtalos-op-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.gz
talos-op-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.zip
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'arch/csky/kernel/signal.c')
-rw-r--r--arch/csky/kernel/signal.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/csky/kernel/signal.c b/arch/csky/kernel/signal.c
index d47a3381aad8..9b1b7c039ddf 100644
--- a/arch/csky/kernel/signal.c
+++ b/arch/csky/kernel/signal.c
@@ -66,7 +66,6 @@ SYSCALL_DEFINE0(rt_sigreturn)
{
struct pt_regs *regs = current_pt_regs();
struct rt_sigframe __user *frame;
- struct task_struct *task;
sigset_t set;
/* Always make any pending restarted system calls return -EINTR */
@@ -91,8 +90,7 @@ SYSCALL_DEFINE0(rt_sigreturn)
return regs->a0;
badframe:
- task = current;
- force_sig(SIGSEGV, task);
+ force_sig(SIGSEGV);
return 0;
}
OpenPOWER on IntegriCloud