Module Name: src
Committed By: uebayasi
Date: Fri Nov 12 13:40:11 UTC 2010
Modified Files:
src/sys/arch/mips/alchemy/dev: if_aumac.c
src/sys/arch/shark/ofw: ofw.c
src/sys/arch/x86/include: bus_private.h
Log Message:
Pull in uvm/uvm.h for VM_PAGE_TO_PHYS().
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mips/alchemy/dev/if_aumac.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/shark/ofw/ofw.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/include/bus_private.h
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/alchemy/dev/if_aumac.c
diff -u src/sys/arch/mips/alchemy/dev/if_aumac.c:1.28 src/sys/arch/mips/alchemy/dev/if_aumac.c:1.29
--- src/sys/arch/mips/alchemy/dev/if_aumac.c:1.28 Mon Apr 5 07:19:30 2010
+++ src/sys/arch/mips/alchemy/dev/if_aumac.c Fri Nov 12 13:40:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.28 2010/04/05 07:19:30 joerg Exp $ */
+/* $NetBSD: if_aumac.c,v 1.29 2010/11/12 13:40:10 uebayasi Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.28 2010/04/05 07:19:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.29 2010/11/12 13:40:10 uebayasi Exp $");
#include "rnd.h"
@@ -62,7 +62,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <uvm/uvm_extern.h> /* for PAGE_SIZE */
+#include <uvm/uvm.h> /* for PAGE_SIZE */
#include <net/if.h>
#include <net/if_dl.h>
Index: src/sys/arch/shark/ofw/ofw.c
diff -u src/sys/arch/shark/ofw/ofw.c:1.53 src/sys/arch/shark/ofw/ofw.c:1.54
--- src/sys/arch/shark/ofw/ofw.c:1.53 Mon Dec 28 03:22:20 2009
+++ src/sys/arch/shark/ofw/ofw.c Fri Nov 12 13:40:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.53 2009/12/28 03:22:20 uebayasi Exp $ */
+/* $NetBSD: ofw.c,v 1.54 2010/11/12 13:40:10 uebayasi Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.53 2009/12/28 03:22:20 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.54 2010/11/12 13:40:10 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include <sys/reboot.h>
#include <sys/mbuf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <dev/cons.h>
Index: src/sys/arch/x86/include/bus_private.h
diff -u src/sys/arch/x86/include/bus_private.h:1.11 src/sys/arch/x86/include/bus_private.h:1.12
--- src/sys/arch/x86/include/bus_private.h:1.11 Mon Apr 28 20:23:40 2008
+++ src/sys/arch/x86/include/bus_private.h Fri Nov 12 13:40:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_private.h,v 1.11 2008/04/28 20:23:40 martin Exp $ */
+/* $NetBSD: bus_private.h,v 1.12 2010/11/12 13:40:11 uebayasi Exp $ */
/* NetBSD: bus.h,v 1.8 2005/03/09 19:04:46 matt Exp */
/*-
@@ -165,7 +165,7 @@
#endif /* _BUS_PMAP_ENTER */
#if !defined(_BUS_VIRT_TO_BUS)
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
static __inline bus_addr_t _bus_virt_to_bus(struct pmap *, vaddr_t);
#define _BUS_VIRT_TO_BUS(pm, va) _bus_virt_to_bus((pm), (va))
