diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-27 12:23:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-27 12:23:39 -0400 |
| commit | d15aa2cc641bd193596382357de917b32f1b40cb (patch) | |
| tree | c7866b49a0e84b87a8e43ac9e652811179d3efdd | |
| parent | 02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a (diff) | |
| parent | 6b95ed345b9faa4ab3598a82991968f2e9f851bb (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.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, | |||
| 566 | * Finally record data if requested. | 566 | * Finally record data if requested. |
| 567 | */ | 567 | */ |
| 568 | if (record) { | 568 | if (record) { |
| 569 | struct perf_sample_data data = { | 569 | struct perf_sample_data data; |
| 570 | .period = event->hw.last_period, | 570 | |
| 571 | }; | 571 | perf_sample_data_init(&data, 0); |
| 572 | 572 | ||
| 573 | if (perf_event_overflow(event, nmi, &data, regs)) { | 573 | if (perf_event_overflow(event, nmi, &data, regs)) { |
| 574 | /* | 574 | /* |