Module Name: src
Committed By: matt
Date: Mon Jun 13 21:19:38 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: bus_dma.c
Log Message:
Use ptoa(x) instead of x << PGSHIFT
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/powerpc/powerpc/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/powerpc/powerpc/bus_dma.c
diff -u src/sys/arch/powerpc/powerpc/bus_dma.c:1.39 src/sys/arch/powerpc/powerpc/bus_dma.c:1.40
--- src/sys/arch/powerpc/powerpc/bus_dma.c:1.39 Wed Jun 8 15:19:57 2011
+++ src/sys/arch/powerpc/powerpc/bus_dma.c Mon Jun 13 21:19:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.39 2011/06/08 15:19:57 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.40 2011/06/13 21:19:38 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.39 2011/06/08 15:19:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.40 2011/06/13 21:19:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -547,10 +547,10 @@
int bank;
for (bank = 0; bank < vm_nphysseg; bank++) {
- if (start > VM_PHYSMEM_PTR(bank)->avail_start << PGSHIFT)
- start = VM_PHYSMEM_PTR(bank)->avail_start << PGSHIFT;
- if (end < VM_PHYSMEM_PTR(bank)->avail_end << PGSHIFT)
- end = VM_PHYSMEM_PTR(bank)->avail_end << PGSHIFT;
+ if (start > ptoa(VM_PHYSMEM_PTR(bank)->avail_start))
+ start = ptoa(VM_PHYSMEM_PTR(bank)->avail_start);
+ if (end < ptoa(VM_PHYSMEM_PTR(bank)->avail_end))
+ end = ptoa(VM_PHYSMEM_PTR(bank)->avail_end);
}
return _bus_dmamem_alloc_range(t, size, alignment, boundary, segs,
