aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2010-08-02 17:17:18 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-13 13:30:37 -0700
commiteca5c118414e728029e764b5ace9b25ced55159d (patch)
treede0360870dcbbab6a55cd9da60c4d70441037db2 /arch
parentda2756b5e1129785dc107a90fcb729728c427c50 (diff)
downloadlinux-linaro-eca5c118414e728029e764b5ace9b25ced55159d.tar.gz
perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
commit 69e77a8b0426ded5d924eea7dbe4eca51e09f530 upstream. Commit 6b95ed345b9faa4ab3598a82991968f2e9f851bb changed from a struct initializer to perf_sample_data_init(), but the setting of the .period member was left out. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/perf_event_fsl_emb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/perf_event_fsl_emb.c b/arch/powerpc/kernel/perf_event_fsl_emb.c
index babcceecd2e..4339d20227b 100644
--- a/arch/powerpc/kernel/perf_event_fsl_emb.c
+++ b/arch/powerpc/kernel/perf_event_fsl_emb.c
@@ -569,6 +569,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
struct perf_sample_data data;
perf_sample_data_init(&data, 0);
+ data.period = event->hw.last_period;
if (perf_event_overflow(event, nmi, &data, regs)) {
/*