[src/trunk]: src/sys/arch/arm/arm rename DCACHE_SIZE to XSCALE_DCACHE_SIZE to...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e3faa51d1988
branches:  trunk
changeset: 829104:e3faa51d1988
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 17 02:37:32 2018 +0000

description:
rename DCACHE_SIZE to XSCALE_DCACHE_SIZE to avoid conflict with genassym
field offset with the same name.

diffstat:

 sys/arch/arm/arm/cpufunc_asm_xscale.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 88102f91ae27 -r e3faa51d1988 sys/arch/arm/arm/cpufunc_asm_xscale.S
--- a/sys/arch/arm/arm/cpufunc_asm_xscale.S     Wed Jan 17 02:16:07 2018 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_xscale.S     Wed Jan 17 02:37:32 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc_asm_xscale.S,v 1.23 2014/03/30 01:15:03 matt Exp $     */
+/*     $NetBSD: cpufunc_asm_xscale.S,v 1.24 2018/01/17 02:37:32 christos Exp $ */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -78,7 +78,7 @@
 /*
  * Size of the XScale core D-cache.
  */
-#define        DCACHE_SIZE             0x00008000
+#define        XSCALE_DCACHE_SIZE              0x00008000
 
 .Lblock_userspace_access:
        .word   _C_LABEL(block_userspace_access)
@@ -255,7 +255,7 @@
 
        .global _C_LABEL(xscale_cache_clean_size)
 _C_LABEL(xscale_cache_clean_size):
-       .word   DCACHE_SIZE
+       .word   XSCALE_DCACHE_SIZE
 
        .global _C_LABEL(xscale_minidata_clean_addr)
 _C_LABEL(xscale_minidata_clean_addr):
@@ -311,7 +311,7 @@
         * alternate between them whenever this is done.  No one knows  \
         * why the work-around works (mmm!).                            \
         */                                                             \
-       eor     r0, r0, #(DCACHE_SIZE)                          ;       \
+       eor     r0, r0, #(XSCALE_DCACHE_SIZE)                   ;       \
        str     r0, [r2]                                        ;       \
        add     r0, r0, r1