diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-10-21 18:11:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-21 18:11:20 +0200 |
| commit | 957b9095ed296311b36d26e4316d7f637351ac57 (patch) | |
| tree | cd7986275c7451a9a23d526b880a66de6f110326 /arch | |
| parent | a05123bdd1b9ba961ed262864924a5b3ee81afe8 (diff) | |
| parent | 44009105081b51417f311f4c3be0061870b6b8ed (diff) | |
| download | linux-3.10-957b9095ed296311b36d26e4316d7f637351ac57.tar.gz linux-3.10-957b9095ed296311b36d26e4316d7f637351ac57.tar.bz2 linux-3.10-957b9095ed296311b36d26e4316d7f637351ac57.zip | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Pull event-wrapping Oprofile fix from Robert Richter.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -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 26b8a8514ee..48768df2471 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; } |