diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-12 10:14:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-12 10:14:45 +0200 |
| commit | 5319e5ad0c4ed416d00515c96f493653f9929c65 (patch) | |
| tree | 29b26be1459e65c5d9661b6b9963457179137d93 /arch/x86/events/intel/core.c | |
| parent | 9ab975a029ec96b47c2f830aef6efd0e24f5c304 (diff) | |
| parent | 6d6f2833bfbf296101f9f085e10488aef2601ba5 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel/core.c')
| -rw-r--r-- | arch/x86/events/intel/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index cd319400dc10..7c666958a625 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3866,7 +3866,7 @@ __init int intel_pmu_init(void) c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1; } c->idxmsk64 &= - ~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed)); + ~(~0ULL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed)); c->weight = hweight64(c->idxmsk64); } } |