diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-11-09 15:19:32 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-11-09 15:19:32 +0100 |
| commit | 29701d69b98d0a132abd63fe2e51125f478fbc53 (patch) | |
| tree | 0650d3905c76124eb8c29d17c8434b5bb8954fe2 /arch | |
| parent | Linux 5.10-rc3 (diff) | |
| parent | task_work: Use TIF_NOTIFY_SIGNAL if available (diff) | |
| download | linux-29701d69b98d0a132abd63fe2e51125f478fbc53.tar.xz linux-29701d69b98d0a132abd63fe2e51125f478fbc53.zip | |
Merge tag 'core-entry-notify-signal' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into tif-task_work.arch
Core changes to support TASK_NOTIFY_SIGNAL
* tag 'core-entry-notify-signal' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
task_work: Use TIF_NOTIFY_SIGNAL if available
entry: Add support for TIF_NOTIFY_SIGNAL
signal: Add task_sigpending() helper
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index be0d7d4152ec..ea794a083c44 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -804,11 +804,11 @@ static inline unsigned long get_nr_restart_syscall(const struct pt_regs *regs) * want to handle. Thus you cannot kill init even with a SIGKILL even by * mistake. */ -void arch_do_signal(struct pt_regs *regs) +void arch_do_signal_or_restart(struct pt_regs *regs, bool has_signal) { struct ksignal ksig; - if (get_signal(&ksig)) { + if (has_signal && get_signal(&ksig)) { /* Whee! Actually deliver the signal. */ handle_signal(&ksig, regs); return; |