summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2010-08-02 22:17:18 (GMT)
committerPaul Mackerras <paulus@samba.org>2010-08-03 00:56:45 (GMT)
commit69e77a8b0426ded5d924eea7dbe4eca51e09f530 (patch)
tree70173eaa6109e2ce6dc4196442743ea71afb923a /arch/powerpc
parent09f86cd093b76b699656eaa82c37ca6d9a02b892 (diff)
downloadlinux-69e77a8b0426ded5d924eea7dbe4eca51e09f530.tar.xz
perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
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> Cc: stable@kernel.org Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-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 fc6a89b..1ba4547 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)) {
/*