diff options
| author | Linus Torvalds | 2019-05-06 21:46:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-05-06 21:46:54 +0200 |
| commit | e50c5d2e725eb7192a62868d4a9987907741ff62 (patch) | |
| tree | 39006b750aefd83e0120599f0985615429b3a014 /arch | |
| parent | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | rseq: Remove superfluous rseq_len from task_struct (diff) | |
| download | kernel-qcow2-linux-e50c5d2e725eb7192a62868d4a9987907741ff62.tar.gz kernel-qcow2-linux-e50c5d2e725eb7192a62868d4a9987907741ff62.tar.xz kernel-qcow2-linux-e50c5d2e725eb7192a62868d4a9987907741ff62.zip | |
Merge branch 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull rseq updates from Ingo Molnar:
"A cleanup and a fix to comments"
* 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
rseq: Remove superfluous rseq_len from task_struct
rseq: Clean up comments by reflecting removal of event counter
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/signal.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/signal.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 76bb8de6bf6b..be5edfdde558 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -549,8 +549,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) int ret; /* - * Increment event counter and perform fixup for the pre-signal - * frame. + * Perform fixup for the pre-signal frame. */ rseq_signal_deliver(ksig, regs); diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index c8aa58a2bab9..dff90fb6a9af 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -693,10 +693,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) sigset_t *set = sigmask_to_save(); compat_sigset_t *cset = (compat_sigset_t *) set; - /* - * Increment event counter and perform fixup for the pre-signal - * frame. - */ + /* Perform fixup for the pre-signal frame. */ rseq_signal_deliver(ksig, regs); /* Set up the stack frame */ |