diff options
| author | uebayasi <uebayasi@NetBSD.org> | 2010-11-13 09:22:10 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@NetBSD.org> | 2010-11-13 09:22:10 +0000 |
| commit | da9947601acd74819ab68bece9446c377c5812e1 (patch) | |
| tree | f3cdd391ab352e0b74738679f853c97c03168807 /sys | |
| parent | cff67190437c604c628b160da4df8a251b37cc89 (diff) | |
Don't redefine famous round_page() / trunc_page() locally.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mips/mips/cache_r5k.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/mips/mips/cache_r5k.c b/sys/arch/mips/mips/cache_r5k.c index 2e4b50023d0..ba9499bc049 100644 --- a/sys/arch/mips/mips/cache_r5k.c +++ b/sys/arch/mips/mips/cache_r5k.c @@ -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_index(vaddr_t va, vsize_t size) 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" |
