Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d15aa2cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 02e7cce2 6b95ed34

arch/powerpc/kernel/perf_event_fsl_emb.c

+3 −3
Original line number Diff line number Diff line
@@ -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)) {

			/*