aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-27 09:23:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-27 09:23:39 -0700
commitd15aa2cc641bd193596382357de917b32f1b40cb (patch)
treec7866b49a0e84b87a8e43ac9e652811179d3efdd
parent02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a (diff)
parent6b95ed345b9faa4ab3598a82991968f2e9f851bb (diff)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf: perf, powerpc: Use perf_sample_data_init() for the FSL code
-rw-r--r--arch/powerpc/kernel/perf_event_fsl_emb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/perf_event_fsl_emb.c b/arch/powerpc/kernel/perf_event_fsl_emb.c
index 369872f6cf78..babcceecd2ea 100644
--- a/arch/powerpc/kernel/perf_event_fsl_emb.c
+++ b/arch/powerpc/kernel/perf_event_fsl_emb.c
@@ -566,9 +566,9 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
* Finally record data if requested.
*/
if (record) {
- struct perf_sample_data data = {
- .period = event->hw.last_period,
- };
+ struct perf_sample_data data;
+
+ perf_sample_data_init(&data, 0);
if (perf_event_overflow(event, nmi, &data, regs)) {
/*

Privacy Policy