From: Ming Lei <tom.leiming@xxxxxxxxx> Obviously it is mistake for CPU_HAS_PMU to depend on (!ARCH_OMAP3 || OMAP3_EMU). No mattery it is omap3 or not, we can build pmu.o into kernel safely. In fact, arm-v7 of omap3 has pmu inside also. So fix it that we can build pmu into kernel to support perf for some valid config(such as enable both omap4 and omap3, but OMAP3_EMU). Cc: Will Deacon <will.deacon@xxxxxxx> Cc: linux-omap@xxxxxxxxxxxxxxx Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx> --- arch/arm/Kconfig | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 377a7a5..ba314d5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1061,8 +1061,7 @@ config XSCALE_PMU default y config CPU_HAS_PMU - depends on (CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU) && \ - (!ARCH_OMAP3 || OMAP3_EMU) + depends on CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU default y bool -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
