* [PATCH 1/1] ARM: cache-l2x0: Fix compile time warnings when !CONFIG_OF
@ 2012-11-22 12:07 Lee Jones
2012-11-22 12:26 ` Russell King - ARM Linux
0 siblings, 1 reply; 3+ messages in thread
From: Lee Jones @ 2012-11-22 12:07 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel
Cc: arnd, linus.walleij, Lee Jones, Russell King, Gregory CLEMENT
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@arm.linux.org.uk>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] ARM: cache-l2x0: Fix compile time warnings when !CONFIG_OF
2012-11-22 12:07 [PATCH 1/1] ARM: cache-l2x0: Fix compile time warnings when !CONFIG_OF Lee Jones
@ 2012-11-22 12:26 ` Russell King - ARM Linux
2012-11-22 16:09 ` Lee Jones
0 siblings, 1 reply; 3+ messages in thread
From: Russell King - ARM Linux @ 2012-11-22 12:26 UTC (permalink / raw)
To: Lee Jones
Cc: linux-arm-kernel, linux-kernel, arnd, linus.walleij, Gregory CLEMENT
I assume you're working with an old kernel... this has already been
fixed.
On Thu, Nov 22, 2012 at 12:07:47PM +0000, Lee Jones wrote:
> 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@arm.linux.org.uk>
> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] ARM: cache-l2x0: Fix compile time warnings when !CONFIG_OF
2012-11-22 12:26 ` Russell King - ARM Linux
@ 2012-11-22 16:09 ` Lee Jones
0 siblings, 0 replies; 3+ messages in thread
From: Lee Jones @ 2012-11-22 16:09 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: linux-arm-kernel, linux-kernel, arnd, linus.walleij, Gregory CLEMENT
On Thu, 22 Nov 2012, Russell King - ARM Linux wrote:
> I assume you're working with an old kernel... this has already been
> fixed.
If by 'old' you mean a few -rc's, then yes.
I've rebased and the issue has gone away, thanks.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-22 22:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-22 12:07 [PATCH 1/1] ARM: cache-l2x0: Fix compile time warnings when !CONFIG_OF Lee Jones
2012-11-22 12:26 ` Russell King - ARM Linux
2012-11-22 16:09 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).