Module Name: src
Committed By: snj
Date: Wed Sep 30 00:06:07 UTC 2009
Modified Files:
src/sys/arch/x86/x86 [netbsd-5]: bus_space.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/arch/x86/x86/bus_space.c: revision 1.22
physical addresses may not fit in u_long, use paddr_t
To generate a diff of this commit:
cvs rdiff -u -r1.20.4.2 -r1.20.4.3 src/sys/arch/x86/x86/bus_space.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/x86/x86/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.20.4.2 src/sys/arch/x86/x86/bus_space.c:1.20.4.3
--- src/sys/arch/x86/x86/bus_space.c:1.20.4.2 Tue Sep 29 23:53:14 2009
+++ src/sys/arch/x86/x86/bus_space.c Wed Sep 30 00:06:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $ */
+/* $NetBSD: bus_space.c,v 1.20.4.3 2009/09/30 00:06:07 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.4.3 2009/09/30 00:06:07 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -301,7 +301,7 @@
x86_mem_add_mapping(bus_addr_t bpa, bus_size_t size,
int cacheable, bus_space_handle_t *bshp)
{
- u_long pa, endpa;
+ paddr_t pa, endpa;
vaddr_t va, sva;
pt_entry_t *pte, xpte;
