aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-10-10 10:18:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-28 10:02:11 -0700
commitef9fccff2f6108bd5128113d64d260d3f075eb16 (patch)
treebdae99a86ddc7daa6126e4d21db830fcdfbd6673
parentc303f82bbe250dc60ef94d1f282a49118fabcaed (diff)
downloadkernel_samsung_crespo-ef9fccff2f6108bd5128113d64d260d3f075eb16.zip
kernel_samsung_crespo-ef9fccff2f6108bd5128113d64d260d3f075eb16.tar.gz
kernel_samsung_crespo-ef9fccff2f6108bd5128113d64d260d3f075eb16.tar.bz2
oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
commit 44009105081b51417f311f4c3be0061870b6b8ed upstream. 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> Signed-off-by: Robert Richter <robert.richter@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/oprofile/nmi_int.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 68894fd..a00c588 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;
}