diff options
| author | Benson Leung <bleung@chromium.org> | 2018-07-09 16:36:00 -0700 |
|---|---|---|
| committer | Benson Leung <bleung@chromium.org> | 2018-07-09 16:36:00 -0700 |
| commit | 40291fb75123816b35ba06696e56b9cf2d96bf90 (patch) | |
| tree | dfff532af8df1c06ca83466c8347873426a81579 /arch/mips/kernel/signal.c | |
| parent | c474e9f2be9992861d926eea3e5d4fb393cd6e2a (diff) | |
| parent | 413c94469a9db26ac4e1d16bf8de0248de93e2d8 (diff) | |
| download | talos-op-linux-40291fb75123816b35ba06696e56b9cf2d96bf90.tar.gz talos-op-linux-40291fb75123816b35ba06696e56b9cf2d96bf90.zip | |
Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19
Immutable branch (mfd, chrome) due for the v4.19 window
Immutable Branch which moves the cros_ec_i2c and cros_ec_spi
transport drivers from mfd to platform/chrome. Changes in arm are a simple
rename in defconfigs. Change in input is a rename in help text.
Diffstat (limited to 'arch/mips/kernel/signal.c')
| -rw-r--r-- | arch/mips/kernel/signal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 9e224469c788..0a9cfe7a0372 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c @@ -801,6 +801,8 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) regs->regs[0] = 0; /* Don't deal with this again. */ } + rseq_signal_deliver(ksig, regs); + if (sig_uses_siginfo(&ksig->ka, abi)) ret = abi->setup_rt_frame(vdso + abi->vdso->off_rt_sigreturn, ksig, regs, oldset); @@ -868,6 +870,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused, if (thread_info_flags & _TIF_NOTIFY_RESUME) { clear_thread_flag(TIF_NOTIFY_RESUME); tracehook_notify_resume(regs); + rseq_handle_notify_resume(NULL, regs); } user_enter(); |
