Module Name: src
Committed By: matt
Date: Wed Dec 15 01:29:38 UTC 2010
Modified Files:
src/sys/arch/alpha/include: userret.h
src/sys/arch/alpha/isa: isa_machdep.c isadma_bounce.c
src/sys/arch/alpha/tc: tc_bus_mem.c tc_dma_3000_500.c tc_sgmap.c
Log Message:
rework <uvm/uvm_extern.h> includes.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/include/userret.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/isa/isa_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/isa/isadma_bounce.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/tc/tc_bus_mem.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/tc/tc_dma_3000_500.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/tc/tc_sgmap.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/alpha/include/userret.h
diff -u src/sys/arch/alpha/include/userret.h:1.8 src/sys/arch/alpha/include/userret.h:1.9
--- src/sys/arch/alpha/include/userret.h:1.8 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/userret.h Wed Dec 15 01:29:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.8 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: userret.h,v 1.9 2010/12/15 01:29:37 matt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -91,6 +91,7 @@
#define _ALPHA_USERRET_H_
#include <sys/userret.h>
+#include <uvm/uvm_extern.h>
/*
* Define the code needed before returning to user mode, for
Index: src/sys/arch/alpha/isa/isa_machdep.c
diff -u src/sys/arch/alpha/isa/isa_machdep.c:1.18 src/sys/arch/alpha/isa/isa_machdep.c:1.19
--- src/sys/arch/alpha/isa/isa_machdep.c:1.18 Sat Mar 14 21:04:02 2009
+++ src/sys/arch/alpha/isa/isa_machdep.c Wed Dec 15 01:29:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.18 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.19 2010/12/15 01:29:37 matt Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.19 2010/12/15 01:29:37 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -42,8 +42,6 @@
#include <sys/errno.h>
#include <sys/device.h>
-#include <uvm/uvm_extern.h>
-
#include <dev/isa/isavar.h>
#include "vga_isa.h"
Index: src/sys/arch/alpha/isa/isadma_bounce.c
diff -u src/sys/arch/alpha/isa/isadma_bounce.c:1.9 src/sys/arch/alpha/isa/isadma_bounce.c:1.10
--- src/sys/arch/alpha/isa/isadma_bounce.c:1.9 Sat Mar 14 14:45:52 2009
+++ src/sys/arch/alpha/isa/isadma_bounce.c Wed Dec 15 01:29:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.9 2009/03/14 14:45:52 dsl Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.10 2010/12/15 01:29:37 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.9 2009/03/14 14:45:52 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.10 2010/12/15 01:29:37 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,8 +48,6 @@
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
-#include <uvm/uvm_extern.h>
-
extern paddr_t avail_end;
/*
Index: src/sys/arch/alpha/tc/tc_bus_mem.c
diff -u src/sys/arch/alpha/tc/tc_bus_mem.c:1.30 src/sys/arch/alpha/tc/tc_bus_mem.c:1.31
--- src/sys/arch/alpha/tc/tc_bus_mem.c:1.30 Sat Mar 14 21:04:03 2009
+++ src/sys/arch/alpha/tc/tc_bus_mem.c Wed Dec 15 01:29:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_bus_mem.c,v 1.30 2009/03/14 21:04:03 dsl Exp $ */
+/* $NetBSD: tc_bus_mem.c,v 1.31 2010/12/15 01:29:37 matt Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.30 2009/03/14 21:04:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.31 2010/12/15 01:29:37 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/bus.h>
#include <dev/tc/tcvar.h>
Index: src/sys/arch/alpha/tc/tc_dma_3000_500.c
diff -u src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.15 src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.16
--- src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.15 Sat Mar 14 15:36:00 2009
+++ src/sys/arch/alpha/tc/tc_dma_3000_500.c Wed Dec 15 01:29:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_500.c,v 1.15 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: tc_dma_3000_500.c,v 1.16 2010/12/15 01:29:38 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.15 2009/03/14 15:36:00 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.16 2010/12/15 01:29:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,8 +40,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <uvm/uvm_extern.h>
-
#define _ALPHA_BUS_DMA_PRIVATE
#include <machine/bus.h>
Index: src/sys/arch/alpha/tc/tc_sgmap.c
diff -u src/sys/arch/alpha/tc/tc_sgmap.c:1.6 src/sys/arch/alpha/tc/tc_sgmap.c:1.7
--- src/sys/arch/alpha/tc/tc_sgmap.c:1.6 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/alpha/tc/tc_sgmap.c Wed Dec 15 01:29:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_sgmap.c,v 1.6 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: tc_sgmap.c,v 1.7 2010/12/15 01:29:38 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v 1.6 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v 1.7 2010/12/15 01:29:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,8 +42,6 @@
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/bus.h>
#include <alpha/tc/tc_sgmap.h>
