Commit-ID: 69e77a8b0426ded5d924eea7dbe4eca51e09f530
Gitweb: http://git.kernel.org/tip/69e77a8b0426ded5d924eea7dbe4eca51e09f530
Author: Scott Wood <scottwood@xxxxxxxxxxxxx>
AuthorDate: Mon, 2 Aug 2010 17:17:18 -0500
Committer: Paul Mackerras <paulus@xxxxxxxxx>
CommitDate: Tue, 3 Aug 2010 10:56:45 +1000
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@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
---
arch/powerpc/kernel/perf_event_fsl_emb.c | 1 +
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)) {
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|