From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 10 Oct 2012 07:18:35 +0000 (+0300)
Subject: oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=44009105081b51417f311f4c3be0061870b6b8ed;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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;
 }