Commit d15aa2cc authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'urgent' of git://

* 'urgent' of git://
  perf, powerpc: Use perf_sample_data_init() for the FSL code
parents 02e7cce2 6b95ed34
......@@ -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)) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment