git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
perf
/
arm_pmu.c
diff --git
a/drivers/perf/arm_pmu.c
b/drivers/perf/arm_pmu.c
index 7b9caa502d3322c357cc19f3431143f6f9c1f8d2..f6ccb2cd4dfc9992322b52c5c3c94e1636f4ec8b 100644
(file)
--- a/
drivers/perf/arm_pmu.c
+++ b/
drivers/perf/arm_pmu.c
@@
-109,6
+109,8
@@
static inline u64 arm_pmu_event_max_period(struct perf_event *event)
{
if (event->hw.flags & ARMPMU_EVT_64BIT)
return GENMASK_ULL(63, 0);
+ else if (event->hw.flags & ARMPMU_EVT_63BIT)
+ return GENMASK_ULL(62, 0);
else if (event->hw.flags & ARMPMU_EVT_47BIT)
return GENMASK_ULL(46, 0);
else