diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2015-01-19 16:00:15 -0600 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2015-01-19 16:00:15 -0600 |
| commit | fe6e91e3387e4f90ed4605a1a538248a31686c16 (patch) | |
| tree | d4e10d0d214ca73500fcbb3dbbd25027320fddda /kernel/events | |
| parent | c6574542149dede8093e326d2c358ba447e30f33 (diff) | |
| parent | 38bdf45f4aa5cb6186d50a29e6cbbd9d486a1519 (diff) | |
Merge branch 'mvebu/fixes-3' into mvebu/soc
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 4c1ee7f2beb..882f835a0d8 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -4461,18 +4461,14 @@ perf_output_sample_regs(struct perf_output_handle *handle, } static void perf_sample_regs_user(struct perf_regs *regs_user, - struct pt_regs *regs) + struct pt_regs *regs, + struct pt_regs *regs_user_copy) { - if (!user_mode(regs)) { - if (current->mm) - regs = task_pt_regs(current); - else - regs = NULL; - } - - if (regs) { - regs_user->abi = perf_reg_abi(current); + if (user_mode(regs)) { + regs_user->abi = perf_reg_abi(current); regs_user->regs = regs; + } else if (current->mm) { + perf_get_regs_user(regs_user, regs, regs_user_copy); } else { regs_user->abi = PERF_SAMPLE_REGS_ABI_NONE; regs_user->regs = NULL; @@ -4951,7 +4947,8 @@ void perf_prepare_sample(struct perf_event_header *header, } if (sample_type & (PERF_SAMPLE_REGS_USER | PERF_SAMPLE_STACK_USER)) - perf_sample_regs_user(&data->regs_user, regs); + perf_sample_regs_user(&data->regs_user, regs, + &data->regs_user_copy); if (sample_type & PERF_SAMPLE_REGS_USER) { /* regs dump ABI info */ |