Commit-ID: 44009105081b51417f311f4c3be0061870b6b8ed Gitweb: http://git.kernel.org/tip/44009105081b51417f311f4c3be0061870b6b8ed Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx> AuthorDate: Wed, 10 Oct 2012 10:18:35 +0300 Committer: Robert Richter <robert.richter@xxxxxxx> CommitDate: Mon, 15 Oct 2012 14:38:24 +0200 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@xxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> v2.6.32.. Signed-off-by: Robert Richter <robert.richter@xxxxxxx> --- 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 26b8a85..48768df 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|