Commit d2538f50 authored by Dan Carpenter's avatar Dan Carpenter Committed by Ben Hutchings

oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()

commit 44009105 upstream.

The "event" variable is a u16 so the shift will always wrap to zero
making the line a no-op.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 59008b83
......@@ -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;
}
......
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