aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-07-28 13:18:01 +0200
committerIngo Molnar <mingo@kernel.org>2020-07-28 13:18:01 +0200
commite89d4ca1df630378bde3e36c42001b755b0044fe (patch)
treed953ccecb8365acab65d0075e674f7e9a9bd9880 /kernel/events
parentx86/perf: Fix a typo (diff)
parentLinux 5.8-rc7 (diff)
downloadlinux-dev-e89d4ca1df630378bde3e36c42001b755b0044fe.tar.xz
linux-dev-e89d4ca1df630378bde3e36c42001b755b0044fe.zip
Merge tag 'v5.8-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/uprobes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index bb0862873dba..5f8b0c52fd2e 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -2199,7 +2199,7 @@ static void handle_swbp(struct pt_regs *regs)
if (!uprobe) {
if (is_swbp > 0) {
/* No matching uprobe; signal SIGTRAP. */
- send_sig(SIGTRAP, current, 0);
+ force_sig(SIGTRAP);
} else {
/*
* Either we raced with uprobe_unregister() or we can't