Skip to content

Commit b3a0708

Browse files
Zaid Al-Bassamwilldeacon
authored andcommitted
perf: pmuv3: Change GENMASK to GENMASK_ULL
GENMASK macro uses "unsigned long" (32-bit wide on arm and 64-bit on arm64), This causes build issues when enabling PMUv3 on arm as it tries to access bits > 31. This patch switches the GENMASK to GENMASK_ULL, which uses "unsigned long long" (64-bit on both arm and arm64). Signed-off-by: Zaid Al-Bassam <[email protected]> Acked-by: Marc Zyngier <[email protected]> Tested-by: Florian Fainelli <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 11fba29 commit b3a0708

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/perf/arm_pmuv3.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,15 +489,15 @@ static bool armv8pmu_event_needs_bias(struct perf_event *event)
489489
static u64 armv8pmu_bias_long_counter(struct perf_event *event, u64 value)
490490
{
491491
if (armv8pmu_event_needs_bias(event))
492-
value |= GENMASK(63, 32);
492+
value |= GENMASK_ULL(63, 32);
493493

494494
return value;
495495
}
496496

497497
static u64 armv8pmu_unbias_long_counter(struct perf_event *event, u64 value)
498498
{
499499
if (armv8pmu_event_needs_bias(event))
500-
value &= ~GENMASK(63, 32);
500+
value &= ~GENMASK_ULL(63, 32);
501501

502502
return value;
503503
}

0 commit comments

Comments
 (0)