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

Commit 957b9095 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'urgent' of... 

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

 into perf/urgent

Pull event-wrapping Oprofile fix from Robert Richter.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a05123bd 44009105

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, 
	val |= counter_config->extra;

	val |= counter_config->extra;

	event &= model->event_mask ? model->event_mask : 0xFF;

	event &= model->event_mask ? model->event_mask : 0xFF;

	val |= event & 0xFF;

	val |= event & 0xFF;

	val |= (event & 0x0F00) << 24;

	val |= (u64)(event & 0x0F00) << 24;





	return val;

	return val;

}

}