diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-08-24 13:35:51 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-08-24 13:44:08 +0100 |
| commit | 5166c20ef95be89d10ffe0140e74df5cf26e9786 (patch) | |
| tree | 5c02f5661d2e6deb534e5726d05c79b5ce3b884f /arch | |
| parent | 34ba2c4247e5c4b1542b1106e156af324660c4f0 (diff) | |
| download | linux-stable-5166c20ef95be89d10ffe0140e74df5cf26e9786.tar.gz linux-stable-5166c20ef95be89d10ffe0140e74df5cf26e9786.tar.bz2 linux-stable-5166c20ef95be89d10ffe0140e74df5cf26e9786.zip | |
arm64: makefile: fix perf_callchain.o kconfig dependency
Commit 4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant
#ifdefs") incorrectly resolved a conflict on arch/arm64/kernel/Makefile
which resulted in a partial revert of 52da443ec4d0 ("arm64: perf: factor
out callchain code"), leading to perf_callchain.o depending on
CONFIG_HW_PERF_EVENTS instead of CONFIG_PERF_EVENTS.
This patch restores the kconfig dependency for perf_callchain.o.
Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index c662197ee57c..22dc9bc781be 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -25,8 +25,8 @@ arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ ../../arm/kernel/opcodes.o arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o -arm64-obj-$(CONFIG_PERF_EVENTS) += perf_regs.o -arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_callchain.o +arm64-obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o +arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o arm64-obj-$(CONFIG_CPU_PM) += sleep.o suspend.o arm64-obj-$(CONFIG_CPU_IDLE) += cpuidle.o |