]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@kernel.org>
Sun, 21 Oct 2012 16:11:20 +0000 (18:11 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 21 Oct 2012 16:11:20 +0000 (18:11 +0200)
Pull event-wrapping Oprofile fix from Robert Richter.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/oprofile/nmi_int.c

index 26b8a8514ee566e8a7d235a06de1037c2641adec..48768df2471af2bc9e4059fad6eb8c583f93f4d0 100644 (file)
@@ -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;
 }