Module Name: src
Committed By: matt
Date: Wed Aug 19 07:41:47 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c
Log Message:
change casting pointer to u_long to uintptr_t
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.16.1 src/sys/arch/mips/mips/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.22 src/sys/arch/mips/mips/bus_dma.c:1.22.16.1
--- src/sys/arch/mips/mips/bus_dma.c:1.22 Wed Jun 4 12:41:41 2008
+++ src/sys/arch/mips/mips/bus_dma.c Wed Aug 19 07:41:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22 2008/06/04 12:41:41 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.22.16.1 2009/08/19 07:41:47 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22 2008/06/04 12:41:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22.16.1 2009/08/19 07:41:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,7 +156,7 @@
/*
* Compute the segment size, and adjust counts.
*/
- sgsize = PAGE_SIZE - ((u_long)vaddr & PGOFSET);
+ sgsize = PAGE_SIZE - ((uintptr_t)vaddr & PGOFSET);
if (buflen < sgsize)
sgsize = buflen;
if (map->dm_maxsegsz < sgsize)
@@ -693,7 +693,7 @@
{
#ifdef DIAGNOSTIC
- if ((u_long)kva & PGOFSET)
+ if ((uintptr_t)kva & PGOFSET)
panic("_bus_dmamem_unmap: bad alignment on %p", kva);
#endif
