diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-27 18:23:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-27 18:23:39 +0200 |
| commit | d15aa2cc641bd193596382357de917b32f1b40cb (patch) | |
| tree | c7866b49a0e84b87a8e43ac9e652811179d3efdd | |
| parent | Merge git://git.infradead.org/users/cbou/battery-2.6.35 (diff) | |
| parent | perf, powerpc: Use perf_sample_data_init() for the FSL code (diff) | |
| download | linux-d15aa2cc641bd193596382357de917b32f1b40cb.tar.xz linux-d15aa2cc641bd193596382357de917b32f1b40cb.zip | |
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.c | 6 |
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)) { /* |