diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-10-10 11:18:35 +0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2012-10-15 16:38:24 +0400 |
| commit | 44009105081b51417f311f4c3be0061870b6b8ed (patch) | |
| tree | 54393572716c0bc3341bdd413c913744f8a8e771 /arch/x86 | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| download | linux-44009105081b51417f311f4c3be0061870b6b8ed.tar.xz | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 26b8a8514ee5..48768df2471a 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -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; } |