[03/67] perf, powerpc: fsl_emb: Restore setting perf_sample_data.period

From: Greg KH
Date: Wed Aug 11 2010 - 20:21:05 EST


2.6.35-stable review patch. If anyone has any objections, please let us know.

------------------

From: Scott Wood <scottwood@xxxxxxxxxxxxx>

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@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
arch/powerpc/kernel/perf_event_fsl_emb.c | 1 +
1 file changed, 1 insertion(+)

--- 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 pe
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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/