summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-08-20 13:46:36 -0700
committerLinux Build Service Account <lnxbuild@localhost>2019-08-20 13:46:36 -0700
commit88dccf7d633bf154097ee158ec19965bdc1cc429 (patch)
tree5d017fab1762ef00cefb4284de5e74ef59320679 /kernel
parent86362a479482ca1d5e7b4afe2d5d559906aa40f4 (diff)
parent2a61e30d4462de293371173af5c153e0ea195f0e (diff)
Merge 2a61e30d4462de293371173af5c153e0ea195f0e on remote branch
Change-Id: I2ab8cb5d719f46431c3e6b1a21c3738686acda93
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 1973c48b0f63..bc33e20db315 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5194,7 +5194,7 @@ static void perf_sample_regs_user(struct perf_regs *regs_user,
if (user_mode(regs)) {
regs_user->abi = perf_reg_abi(current);
regs_user->regs = regs;
- } else if (current->mm) {
+ } else if (!(current->flags & PF_KTHREAD)) {
perf_get_regs_user(regs_user, regs, regs_user_copy);
} else {
regs_user->abi = PERF_SAMPLE_REGS_ABI_NONE;