Commit 44009105 authored Oct 10, 2012 by Dan Carpenter Committed by Robert Richter Oct 15, 2012

oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()



The "event" variable is a u16 so the shift will always wrap to zero
making the line a no-op.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: <stable@vger.kernel.org> v2.6.32..
Signed-off-by: Robert Richter <robert.richter@amd.com>

parent ddffeb8c

arch/x86/oprofile/nmi_int.c

+1 −1

Original line number	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;
		event &= model->event_mask ? model->event_mask : 0xFF;
		val \|= event & 0xFF;
		val \|= (event & 0x0F00) << 24;
		val \|= (u64)(event & 0x0F00) << 24;

		return val;
		}