diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-21 17:21:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-21 17:21:41 -0700 |
| commit | 661dc19066ef0fdcb2db3e2542c45744a4067e87 (patch) | |
| tree | b67a4d6bef7a8b8a6a9ebb4338aaf497d11ed366 /drivers | |
| parent | 3faae16b5aaed284c7de6f4c12240da67497d3a3 (diff) | |
| parent | 1d63d1d9e5c5cb2e7c7ca75751a5eaf67c5623a7 (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Re-instate the CPUMASK_OFFSTACK option for arm64 when NR_CPUS > 256.
The bug that led to the initial revert was the cpufreq-dt code not
using zalloc_cpumask_var().
- Make the STARFIVE_STARLINK_PMU config option depend on 64BIT to
prevent compile-test failures on 32-bit architectures due to missing
writeq().
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
perf: starfive: fix 64-bit only COMPILE_TEST condition
ARM64: Dynamically allocate cpumasks and increase supported CPUs to 512
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/perf/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig index 004d86230aa6..54ff5cc17ccd 100644 --- a/drivers/perf/Kconfig +++ b/drivers/perf/Kconfig @@ -87,7 +87,8 @@ config RISCV_PMU_SBI filtering, counter configuration. config STARFIVE_STARLINK_PMU - depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT) + depends on ARCH_STARFIVE || COMPILE_TEST + depends on 64BIT bool "StarFive StarLink PMU" help Provide support for StarLink Performance Monitor Unit. |