]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
arm64: makefile: fix perf_callchain.o kconfig dependency
authorWill Deacon <will.deacon@arm.com>
Mon, 24 Aug 2015 12:35:51 +0000 (13:35 +0100)
committerWill Deacon <will.deacon@arm.com>
Mon, 24 Aug 2015 12:44:08 +0000 (13:44 +0100)
commit5166c20ef95be89d10ffe0140e74df5cf26e9786
tree5c02f5661d2e6deb534e5726d05c79b5ce3b884f
parent34ba2c4247e5c4b1542b1106e156af324660c4f0
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>
arch/arm64/kernel/Makefile