forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
commit
957b9095ed
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user