[src/trunk]: src/sys/arch/mips/mips Don't redefine famous round_page() / trun...

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

details:   https://anonhg.NetBSD.org/src/rev/1d407f8004b9
branches:  trunk
changeset: 758699:1d407f8004b9
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Nov 13 09:22:10 2010 +0000

description:
Don't redefine famous round_page() / trunc_page() locally.

diffstat:

 sys/arch/mips/mips/cache_r5k.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 33705e02aa65 -r 1d407f8004b9 sys/arch/mips/mips/cache_r5k.c
--- a/sys/arch/mips/mips/cache_r5k.c    Sat Nov 13 08:55:13 2010 +0000
+++ b/sys/arch/mips/mips/cache_r5k.c    Sat Nov 13 09:22:10 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cache_r5k.c,v 1.12 2005/12/24 20:07:19 perry Exp $     */
+/*     $NetBSD: cache_r5k.c,v 1.13 2010/11/13 09:22:10 uebayasi Exp $  */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache_r5k.c,v 1.12 2005/12/24 20:07:19 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache_r5k.c,v 1.13 2010/11/13 09:22:10 uebayasi Exp $");
 
 #include <sys/param.h>
 
@@ -621,16 +621,16 @@
        r5k_sdcache_wbinv_range(va, size);
 }
 
-#define        round_page(x)           (((x) + (128 * 32 - 1)) & ~(128 * 32 - 1))
-#define        trunc_page(x)           ((x) & ~(128 * 32 - 1))
+#define        mips_r5k_round_page(x)          (((x) + (128 * 32 - 1)) & ~(128 * 32 - 1))
+#define        mips_r5k_trunc_page(x)          ((x) & ~(128 * 32 - 1))
 
 void
 r5k_sdcache_wbinv_range(vaddr_t va, vsize_t size)
 {
        uint32_t ostatus, taglo;
-       vaddr_t eva = round_page(va + size);
+       vaddr_t eva = mips_r5k_round_page(va + size);
 
-       va = trunc_page(va);
+       va = mips_r5k_trunc_page(va);
 
        __asm volatile(
                ".set noreorder         \n\t"