diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-29 04:59:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-29 04:59:29 -0700 |
| commit | 6876dc0e1339dbf51ed19fcfb933e615bd3808fc (patch) | |
| tree | 19077cc26d3364cb07045a95ca816ee7bb7a602a /kernel | |
| parent | 80cb08efce94fb197b05bc1c9dfaeb72a765eb96 (diff) | |
| parent | ae81a07395be43d63d9fe8ec632a351626320ead (diff) | |
Merge "Merge android-4.4.186 (aeb051d) into msm-4.4"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 2 |
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; |