[PATCH 1/1] ARM: cache-l2x0: Fix compile time warnings when !CONFIG_OF

From: Lee Jones
Date: Thu Nov 22 2012 - 14:06:04 EST


Introduced by:
07bd005ed2457876f653fda12981708d737543df
ARM: 7547/1: cache-l2x0: add support for Aurora L2 cache ctrl

arch/arm/mm/cache-l2x0.c:37:12: warning: âl2_wt_overrideâ defined but not used
arch/arm/mm/cache-l2x0.c:292:22: warning: âcalc_range_endâ defined but not used
arch/arm/mm/cache-l2x0.c:315:13: warning: âaurora_pa_rangeâ defined but not used
arch/arm/mm/cache-l2x0.c:328:13: warning: âaurora_inv_rangeâ defined but not used
arch/arm/mm/cache-l2x0.c:347:13: warning: âaurora_clean_rangeâ defined but not used
arch/arm/mm/cache-l2x0.c:365:13: warning: âaurora_flush_rangeâ defined but not used

Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
Cc: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
arch/arm/mm/cache-l2x0.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index bfb5986..25a9226 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -34,7 +34,6 @@ static DEFINE_RAW_SPINLOCK(l2x0_lock);
static u32 l2x0_way_mask; /* Bitmask of active ways */
static u32 l2x0_size;
static unsigned long sync_reg_offset = L2X0_CACHE_SYNC;
-static int l2_wt_override;

/* Aurora don't have the cache ID register available, so we have to
* pass it though the device tree */
@@ -284,6 +283,10 @@ static void l2x0_flush_range(unsigned long start, unsigned long end)
raw_spin_unlock_irqrestore(&l2x0_lock, flags);
}

+#ifdef CONFIG_OF
+
+static int l2_wt_override;
+
/*
* Note that the end addresses passed to Linux primitives are
* noninclusive, while the hardware cache range operations use
@@ -375,6 +378,7 @@ static void aurora_flush_range(unsigned long start, unsigned long end)
}
}
}
+#endif

static void l2x0_disable(void)
{
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/