[PATCH] [ARM] Build failure CONFIG_ARCH_KIRKWOOD_DT relies on CACHE_FEROCEON_L2
From: Olof Johansson <hidden>
Date: 2012-10-01 02:44:10
Hi, On Sun, Sep 30, 2012 at 4:22 PM, Jason Gunthorpe [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Move the CACHE_FEROCEON_L2 test to kirkwood_l2_init, since linking fails on the reference to feroceon_l2_init. Signed-off-by: Jason Gunthorpe <redacted> --- arch/arm/mach-kirkwood/board-dt.c | 2 -- arch/arm/mach-kirkwood/common.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index e4eb450..d00223e 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c@@ -50,9 +50,7 @@ static void __init kirkwood_dt_init(void) kirkwood_setup_cpu_mbus(); -#ifdef CONFIG_CACHE_FEROCEON_L2 kirkwood_l2_init(); -#endif /* Setup root of clk tree */ kirkwood_clk_init();diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 1201191..4177304 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c@@ -645,6 +645,7 @@ char * __init kirkwood_id(void) void __init kirkwood_l2_init(void) { +#ifdef CONFIG_CACHE_FEROCEON_L2 #ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
Aren't these added ifdefs completely redundant? L2_WRITETHROUGH is dependent on the outer options anyway. -Olof