ARM: 8887/1: aurora-l2: add prefix to MAX_RANGE_SIZE

The macro name is too generic, so add a AURORA_ prefix.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/arch/arm/include/asm/hardware/cache-aurora-l2.h b/arch/arm/include/asm/hardware/cache-aurora-l2.h
index c86124769831adece03440b322b248953ca507b7..dc5c479ec4c363c72dbafc875d8c96f50af9cdb9 100644 (file)
--- a/arch/arm/include/asm/hardware/cache-aurora-l2.h
+++ b/arch/arm/include/asm/hardware/cache-aurora-l2.h
@@ -41,7 +41,7 @@
 #define AURORA_ACR_FORCE_WRITE_THRO_POLICY     \
        (2 << AURORA_ACR_FORCE_WRITE_POLICY_OFFSET)
 
-#define MAX_RANGE_SIZE         1024
+#define AURORA_MAX_RANGE_SIZE  1024
 
 #define AURORA_WAY_SIZE_SHIFT  2
 

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 428d087181074d1b3b016853f376723f16312408..83b733a1f1e68af6ce7cd02c9810ac90d7f45843 100644 (file)
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1352,8 +1352,8 @@ static unsigned long aurora_range_end(unsigned long start, unsigned long end)
         * since cache range operations stall the CPU pipeline
         * until completion.
         */
-       if (end > start + MAX_RANGE_SIZE)
-               end = start + MAX_RANGE_SIZE;
+       if (end > start + AURORA_MAX_RANGE_SIZE)
+               end = start + AURORA_MAX_RANGE_SIZE;
 
        /*
         * Cache range operations can't straddle a page boundary.