Commit 661dc190 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3faae16b 1d63d1d9

arch/arm64/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ config ARM64 
	select CLONE_BACKWARDS

	select COMMON_CLK

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select CPUMASK_OFFSTACK if NR_CPUS > 256

	select CRC32

	select DCACHE_WORD_ACCESS

	select DYNAMIC_FTRACE if FUNCTION_TRACER
@@ -1425,7 +1426,7 @@ config SCHED_SMT 
config NR_CPUS

	int "Maximum number of CPUs (2-4096)"

	range 2 4096

	default "256"

	default "512"



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

drivers/perf/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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.