mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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 <[email protected]>
This commit is contained in:
commit
957b9095ed
1 changed files with 1 additions and 1 deletions
|
|
@ -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 a new issue