diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 15:28:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 15:28:50 +0100 |
| commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch) | |
| tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 /arch/arm/Kconfig | |
| parent | 40d3f02851577da27b5cbb1538888301245ef1e7 (diff) | |
| parent | 81497953e37bc28209d9a647171ea93b4a99fc57 (diff) | |
| download | linux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.bz2 | |
Merge branch 'devel-stable' into for-linus
Conflicts:
drivers/perf/arm_pmu.c
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 345882856287..45e635b87943 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1499,6 +1499,7 @@ config HOTPLUG_CPU config ARM_PSCI bool "Support for the ARM Power State Coordination Interface (PSCI)" depends on CPU_V7 + select ARM_PSCI_FW help Say Y here if you want Linux to communicate with system firmware implementing the PSCI specification for CPU-centric power @@ -1719,12 +1720,8 @@ config CPU_SW_DOMAIN_PAN the remainder of userspace will become appropriately inaccessible. config HW_PERF_EVENTS - bool "Enable hardware performance counter support for perf events" - depends on PERF_EVENTS - default y - help - Enable hardware performance counter support for perf events. If - disabled, perf events will use software events only. + def_bool y + depends on ARM_PMU config SYS_SUPPORTS_HUGETLBFS def_bool y |