Commit 44009105 authored by Dan Carpenter's avatar Dan Carpenter Committed by Robert Richter

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: <stable@vger.kernel.org> v2.6.32..
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent ddffeb8c
...@@ -55,7 +55,7 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, ...@@ -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;
} }
......
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