]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
authorScott Wood <scottwood@freescale.com>
Mon, 2 Aug 2010 22:17:18 +0000 (17:17 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 13 Aug 2010 20:30:37 +0000 (13:30 -0700)
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>
arch/powerpc/kernel/perf_event_fsl_emb.c

index babcceecd2eab6335217d2434c6e91e5c7fe5884..4339d20227b89e342b1d7e32c3b87d9b9a0d011e 100644 (file)
@@ -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)) {
                        /*