diff options
| author | Thomas Gleixner | 2019-07-28 22:22:40 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-07-28 22:22:40 +0200 |
| commit | 7a30bdd99f37352b188575b27924c407c6ddff9e (patch) | |
| tree | 10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /arch/nios2/kernel/traps.c | |
| parent | x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS (diff) | |
| parent | Linux 5.3-rc2 (diff) | |
| download | kernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.gz kernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.xz kernel-qcow2-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/nios2/kernel/traps.c')
| -rw-r--r-- | arch/nios2/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/kernel/traps.c b/arch/nios2/kernel/traps.c index 3bc3cd22b750..486db793923c 100644 --- a/arch/nios2/kernel/traps.c +++ b/arch/nios2/kernel/traps.c @@ -26,7 +26,7 @@ static DEFINE_SPINLOCK(die_lock); static void _send_sig(int signo, int code, unsigned long addr) { - force_sig_fault(signo, code, (void __user *) addr, current); + force_sig_fault(signo, code, (void __user *) addr); } void die(const char *str, struct pt_regs *regs, long err) |