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

This commit is contained in:
uebayasi 2010-11-13 09:22:10 +00:00
parent cff6719043
commit da9947601a
1 changed files with 6 additions and 6 deletions

View File

@ -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"