uvm_map.h included proc.h for two functions which are now in systm.h.  So 
you think it would be an easy change to remove proc.h.  hahahaha.

Turns out sysctl.h depends on proc.h (and includes it ifndef _KERNEL 
bizarrely enough), but unconditionally picks up uvm_map.h, so nobody in 
the kernel ever noticed.

They also apparently never noticed that there was no need to include 
sysctl.h at all, but it just got copied from file to file to file.

Diff below makes the simple fix above to uvm_map.h, then handles all the 
sysctl.h related fallout.

Works on i386, but as you can see, there's MD portions of this, so I need 
some help getting it working on all platforms.

Index: arch/i386/i386/acpi_machdep.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/acpi_machdep.c,v
retrieving revision 1.29
diff -u -r1.29 acpi_machdep.c
--- arch/i386/i386/acpi_machdep.c       7 Apr 2010 06:33:06 -0000       1.29
+++ arch/i386/i386/acpi_machdep.c       18 Apr 2010 20:13:49 -0000
@@ -21,6 +21,7 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
+#include <sys/proc.h>
 #include <sys/user.h>
 
 #include <uvm/uvm_extern.h>
Index: arch/i386/i386/amdmsr.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/amdmsr.c,v
retrieving revision 1.8
diff -u -r1.8 amdmsr.c
--- arch/i386/i386/amdmsr.c     1 Jul 2008 12:03:48 -0000       1.8
+++ arch/i386/i386/amdmsr.c     18 Apr 2010 19:56:55 -0000
@@ -25,7 +25,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
-#include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <machine/amdmsr.h>
Index: arch/i386/i386/autoconf.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/autoconf.c,v
retrieving revision 1.81
diff -u -r1.81 autoconf.c
--- arch/i386/i386/autoconf.c   21 Jul 2008 04:35:54 -0000      1.81
+++ arch/i386/i386/autoconf.c   18 Apr 2010 20:03:11 -0000
@@ -45,6 +45,7 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/dkstat.h>
Index: arch/i386/i386/est.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/est.c,v
retrieving revision 1.34
diff -u -r1.34 est.c
--- arch/i386/i386/est.c        28 Mar 2010 03:09:50 -0000      1.34
+++ arch/i386/i386/est.c        18 Apr 2010 20:15:25 -0000
@@ -55,6 +55,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 
Index: arch/i386/i386/longrun.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/longrun.c,v
retrieving revision 1.14
diff -u -r1.14 longrun.c
--- arch/i386/i386/longrun.c    10 Sep 2008 14:01:22 -0000      1.14
+++ arch/i386/i386/longrun.c    18 Apr 2010 20:01:47 -0000
@@ -31,6 +31,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/timeout.h>
 
Index: arch/i386/i386/mp_setperf.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/mp_setperf.c,v
retrieving revision 1.3
diff -u -r1.3 mp_setperf.c
--- arch/i386/i386/mp_setperf.c 6 Jun 2009 20:37:45 -0000       1.3
+++ arch/i386/i386/mp_setperf.c 18 Apr 2010 20:01:03 -0000
@@ -17,6 +17,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/mutex.h>
 
Index: arch/i386/i386/p4tcc.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/p4tcc.c,v
retrieving revision 1.16
diff -u -r1.16 p4tcc.c
--- arch/i386/i386/p4tcc.c      12 Nov 2009 04:13:15 -0000      1.16
+++ arch/i386/i386/p4tcc.c      18 Apr 2010 20:01:31 -0000
@@ -37,6 +37,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <machine/cpu.h>
Index: arch/i386/i386/powernow-k7.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/powernow-k7.c,v
retrieving revision 1.33
diff -u -r1.33 powernow-k7.c
--- arch/i386/i386/powernow-k7.c        7 Sep 2007 03:50:42 -0000       1.33
+++ arch/i386/i386/powernow-k7.c        18 Apr 2010 20:14:54 -0000
@@ -32,6 +32,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <machine/cpu.h>
Index: arch/i386/i386/powernow-k8.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/powernow-k8.c,v
retrieving revision 1.25
diff -u -r1.25 powernow-k8.c
--- arch/i386/i386/powernow-k8.c        29 Jun 2008 03:50:49 -0000      1.25
+++ arch/i386/i386/powernow-k8.c        18 Apr 2010 20:15:01 -0000
@@ -31,6 +31,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <dev/isa/isareg.h>
Index: arch/i386/i386/powernow.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/powernow.c,v
retrieving revision 1.3
diff -u -r1.3 powernow.c
--- arch/i386/i386/powernow.c   12 Dec 2006 23:14:27 -0000      1.3
+++ arch/i386/i386/powernow.c   18 Apr 2010 20:15:09 -0000
@@ -22,6 +22,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <machine/cpu.h>
Index: arch/i386/i386/sg_dma.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/sg_dma.c,v
retrieving revision 1.5
diff -u -r1.5 sg_dma.c
--- arch/i386/i386/sg_dma.c     8 Apr 2010 00:55:25 -0000       1.5
+++ arch/i386/i386/sg_dma.c     18 Apr 2010 20:02:22 -0000
@@ -54,6 +54,7 @@
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 
 #include <uvm/uvm_extern.h>
 
Index: arch/i386/pci/elan520.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/pci/elan520.c,v
retrieving revision 1.16
diff -u -r1.16 elan520.c
--- arch/i386/pci/elan520.c     14 Jan 2009 07:58:45 -0000      1.16
+++ arch/i386/pci/elan520.c     18 Apr 2010 19:57:30 -0000
@@ -40,6 +40,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
Index: arch/i386/pci/glxpcib.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/pci/glxpcib.c,v
retrieving revision 1.8
diff -u -r1.8 glxpcib.c
--- arch/i386/pci/glxpcib.c     21 Feb 2010 18:36:57 -0000      1.8
+++ arch/i386/pci/glxpcib.c     18 Apr 2010 19:57:01 -0000
@@ -26,7 +26,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
-#include <sys/sysctl.h>
 #include <sys/timetc.h>
 
 #include <machine/bus.h>
Index: arch/i386/pci/ichpcib.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/pci/ichpcib.c,v
retrieving revision 1.23
diff -u -r1.23 ichpcib.c
--- arch/i386/pci/ichpcib.c     4 Jan 2008 00:23:25 -0000       1.23
+++ arch/i386/pci/ichpcib.c     18 Apr 2010 19:57:47 -0000
@@ -25,6 +25,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #ifdef __HAVE_TIMECOUNTER
 #include <sys/timetc.h>
Index: arch/i386/pci/piixpcib.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/arch/i386/pci/piixpcib.c,v
retrieving revision 1.5
diff -u -r1.5 piixpcib.c
--- arch/i386/pci/piixpcib.c    31 Oct 2009 12:26:36 -0000      1.5
+++ arch/i386/pci/piixpcib.c    18 Apr 2010 19:55:53 -0000
@@ -55,6 +55,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
Index: compat/aout/compat_aout.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/compat/aout/compat_aout.c,v
retrieving revision 1.3
diff -u -r1.3 compat_aout.c
--- compat/aout/compat_aout.c   5 Mar 2009 19:52:23 -0000       1.3
+++ compat/aout/compat_aout.c   18 Apr 2010 19:54:30 -0000
@@ -25,6 +25,7 @@
  *
  */
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/syscall.h>
 #include <sys/signalvar.h>
 #include <sys/mount.h>
Index: crypto/cryptodev.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/crypto/cryptodev.c,v
retrieving revision 1.70
diff -u -r1.70 cryptodev.c
--- crypto/cryptodev.c  17 Feb 2009 19:16:26 -0000      1.70
+++ crypto/cryptodev.c  18 Apr 2010 20:07:09 -0000
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/sysctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/errno.h>
Index: crypto/cryptosoft.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/crypto/cryptosoft.c,v
retrieving revision 1.52
diff -u -r1.52 cryptosoft.c
--- crypto/cryptosoft.c 10 Jan 2010 12:43:07 -0000      1.52
+++ crypto/cryptosoft.c 18 Apr 2010 20:07:02 -0000
@@ -25,7 +25,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/sysctl.h>
 #include <sys/errno.h>
 #include <dev/rndvar.h>
 #include <crypto/md5.h>
Index: crypto/xform.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/crypto/xform.c,v
retrieving revision 1.37
diff -u -r1.37 xform.c
--- crypto/xform.c      10 Jan 2010 12:43:07 -0000      1.37
+++ crypto/xform.c      18 Apr 2010 20:06:56 -0000
@@ -44,7 +44,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/sysctl.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
Index: dev/rnd.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/rnd.c,v
retrieving revision 1.101
diff -u -r1.101 rnd.c
--- dev/rnd.c   9 Nov 2009 17:53:39 -0000       1.101
+++ dev/rnd.c   18 Apr 2010 19:51:03 -0000
@@ -247,7 +247,6 @@
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
-#include <sys/sysctl.h>
 #include <sys/timeout.h>
 #include <sys/poll.h>
 #include <sys/mutex.h>
Index: dev/ic/acx100.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/acx100.c,v
retrieving revision 1.20
diff -u -r1.20 acx100.c
--- dev/ic/acx100.c     18 Jul 2007 19:24:21 -0000      1.20
+++ dev/ic/acx100.c     18 Apr 2010 19:48:22 -0000
@@ -55,7 +55,6 @@
 #include <sys/mbuf.h>
 #include <sys/endian.h>
 #include <sys/socket.h>
-#include <sys/sysctl.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
Index: dev/ic/acx111.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/acx111.c,v
retrieving revision 1.17
diff -u -r1.17 acx111.c
--- dev/ic/acx111.c     1 Jun 2008 10:17:45 -0000       1.17
+++ dev/ic/acx111.c     18 Apr 2010 19:48:15 -0000
@@ -53,7 +53,7 @@
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/socket.h>
-#include <sys/sysctl.h>
+#include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
Index: dev/ic/ar5416.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/ar5416.c,v
retrieving revision 1.5
diff -u -r1.5 ar5416.c
--- dev/ic/ar5416.c     28 Mar 2010 13:02:57 -0000      1.5
+++ dev/ic/ar5416.c     18 Apr 2010 19:46:46 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/ic/ar5xxx.h
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/ar5xxx.h,v
retrieving revision 1.47
diff -u -r1.47 ar5xxx.h
--- dev/ic/ar5xxx.h     24 Jul 2009 16:31:27 -0000      1.47
+++ dev/ic/ar5xxx.h     18 Apr 2010 19:45:59 -0000
@@ -33,7 +33,7 @@
 #define _AR5K_H
 
 #include <sys/param.h>
-#include <sys/sysctl.h>
+#include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>
Index: dev/ic/ar9280.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/ar9280.c,v
retrieving revision 1.3
diff -u -r1.3 ar9280.c
--- dev/ic/ar9280.c     17 Nov 2009 19:32:22 -0000      1.3
+++ dev/ic/ar9280.c     18 Apr 2010 19:47:00 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/ic/ar9285.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/ar9285.c,v
retrieving revision 1.6
diff -u -r1.6 ar9285.c
--- dev/ic/ar9285.c     7 Apr 2010 16:19:33 -0000       1.6
+++ dev/ic/ar9285.c     18 Apr 2010 19:47:06 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/ic/ar9287.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/ar9287.c,v
retrieving revision 1.7
diff -u -r1.7 ar9287.c
--- dev/ic/ar9287.c     5 Apr 2010 19:09:00 -0000       1.7
+++ dev/ic/ar9287.c     18 Apr 2010 19:47:20 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/ic/ath.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/ath.c,v
retrieving revision 1.84
diff -u -r1.84 ath.c
--- dev/ic/ath.c        13 Oct 2009 19:33:16 -0000      1.84
+++ dev/ic/ath.c        18 Apr 2010 19:46:21 -0000
@@ -45,7 +45,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
Index: dev/ic/athn.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/athn.c,v
retrieving revision 1.35
diff -u -r1.35 athn.c
--- dev/ic/athn.c       10 Apr 2010 19:07:24 -0000      1.35
+++ dev/ic/athn.c       18 Apr 2010 19:46:35 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/ic/pgt.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/pgt.c,v
retrieving revision 1.57
diff -u -r1.57 pgt.c
--- dev/ic/pgt.c        29 Mar 2010 23:33:39 -0000      1.57
+++ dev/ic/pgt.c        18 Apr 2010 19:48:28 -0000
@@ -55,7 +55,6 @@
 #include <sys/mbuf.h>
 #include <sys/endian.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/kthread.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
Index: dev/ic/rt2560.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/rt2560.c,v
retrieving revision 1.46
diff -u -r1.46 rt2560.c
--- dev/ic/rt2560.c     1 Nov 2009 12:08:36 -0000       1.46
+++ dev/ic/rt2560.c     18 Apr 2010 19:47:32 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/ic/rt2661.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/rt2661.c,v
retrieving revision 1.52
diff -u -r1.52 rt2661.c
--- dev/ic/rt2661.c     14 Feb 2010 09:20:34 -0000      1.52
+++ dev/ic/rt2661.c     18 Apr 2010 19:47:39 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/ic/rt2860.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/ic/rt2860.c,v
retrieving revision 1.51
diff -u -r1.51 rt2860.c
--- dev/ic/rt2860.c     12 Apr 2010 18:02:31 -0000      1.51
+++ dev/ic/rt2860.c     18 Apr 2010 19:47:51 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/pci/amdpcib.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/amdpcib.c,v
retrieving revision 1.1
diff -u -r1.1 amdpcib.c
--- dev/pci/amdpcib.c   7 Oct 2007 18:41:06 -0000       1.1
+++ dev/pci/amdpcib.c   18 Apr 2010 19:54:56 -0000
@@ -24,7 +24,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/sysctl.h>
 #include <sys/timetc.h>
 
 #include <machine/bus.h>
Index: dev/pci/auglx.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/auglx.c,v
retrieving revision 1.2
diff -u -r1.2 auglx.c
--- dev/pci/auglx.c     19 Feb 2010 15:02:37 -0000      1.2
+++ dev/pci/auglx.c     18 Apr 2010 19:58:01 -0000
@@ -43,7 +43,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/sysctl.h>
 #include <sys/audioio.h>
 
 #include <machine/bus.h>
Index: dev/pci/if_em.h
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/if_em.h,v
retrieving revision 1.46
diff -u -r1.46 if_em.h
--- dev/pci/if_em.h     25 Nov 2009 13:28:13 -0000      1.46
+++ dev/pci/if_em.h     18 Apr 2010 20:00:12 -0000
@@ -48,6 +48,7 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
+#include <sys/timeout.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
Index: dev/pci/if_ipw.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/if_ipw.c,v
retrieving revision 1.85
diff -u -r1.85 if_ipw.c
--- dev/pci/if_ipw.c    29 Mar 2009 21:53:52 -0000      1.85
+++ dev/pci/if_ipw.c    18 Apr 2010 19:58:44 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/workq.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
Index: dev/pci/if_iwi.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/if_iwi.c,v
retrieving revision 1.101
diff -u -r1.101 if_iwi.c
--- dev/pci/if_iwi.c    11 May 2009 19:24:57 -0000      1.101
+++ dev/pci/if_iwi.c    18 Apr 2010 19:58:37 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/pci/if_iwn.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/if_iwn.c,v
retrieving revision 1.88
diff -u -r1.88 if_iwn.c
--- dev/pci/if_iwn.c    10 Apr 2010 08:37:36 -0000      1.88
+++ dev/pci/if_iwn.c    18 Apr 2010 19:58:25 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/pci/if_ixgb.h
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/if_ixgb.h,v
retrieving revision 1.11
diff -u -r1.11 if_ixgb.h
--- dev/pci/if_ixgb.h   10 Aug 2009 19:41:05 -0000      1.11
+++ dev/pci/if_ixgb.h   18 Apr 2010 19:59:43 -0000
@@ -47,6 +47,7 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
+#include <sys/timeout.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
Index: dev/pci/if_wpi.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/pci/if_wpi.c,v
retrieving revision 1.99
diff -u -r1.99 if_wpi.c
--- dev/pci/if_wpi.c    17 Nov 2009 20:35:51 -0000      1.99
+++ dev/pci/if_wpi.c    18 Apr 2010 19:58:28 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/if_otus.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/if_otus.c,v
retrieving revision 1.16
diff -u -r1.16 if_otus.c
--- dev/usb/if_otus.c   14 Apr 2010 20:01:07 -0000      1.16
+++ dev/usb/if_otus.c   18 Apr 2010 19:52:47 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/if_ral.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/if_ral.c,v
retrieving revision 1.111
diff -u -r1.111 if_ral.c
--- dev/usb/if_ral.c    13 Oct 2009 19:33:17 -0000      1.111
+++ dev/usb/if_ral.c    18 Apr 2010 19:53:10 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/if_rum.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/if_rum.c,v
retrieving revision 1.87
diff -u -r1.87 if_rum.c
--- dev/usb/if_rum.c    13 Oct 2009 19:33:17 -0000      1.87
+++ dev/usb/if_rum.c    18 Apr 2010 19:53:04 -0000
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/if_run.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/if_run.c,v
retrieving revision 1.68
diff -u -r1.68 if_run.c
--- dev/usb/if_run.c    15 Apr 2010 17:46:53 -0000      1.68
+++ dev/usb/if_run.c    18 Apr 2010 19:53:01 -0000
@@ -25,7 +25,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/if_uath.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/if_uath.c,v
retrieving revision 1.40
diff -u -r1.40 if_uath.c
--- dev/usb/if_uath.c   13 Oct 2009 19:33:17 -0000      1.40
+++ dev/usb/if_uath.c   18 Apr 2010 19:52:25 -0000
@@ -32,7 +32,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/if_upgt.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/if_upgt.c,v
retrieving revision 1.48
diff -u -r1.48 if_upgt.c
--- dev/usb/if_upgt.c   13 Oct 2009 19:33:17 -0000      1.48
+++ dev/usb/if_upgt.c   18 Apr 2010 19:52:37 -0000
@@ -20,7 +20,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/uberry.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/uberry.c,v
retrieving revision 1.16
diff -u -r1.16 uberry.c
--- dev/usb/uberry.c    13 Oct 2009 19:33:17 -0000      1.16
+++ dev/usb/uberry.c    18 Apr 2010 19:38:24 -0000
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
Index: dev/usb/ucycom.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/usb/ucycom.c,v
retrieving revision 1.15
diff -u -r1.15 ucycom.c
--- dev/usb/ucycom.c    13 Oct 2009 19:33:17 -0000      1.15
+++ dev/usb/ucycom.c    18 Apr 2010 19:53:22 -0000
@@ -44,7 +44,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/sysctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
Index: kern/kern_tc.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/kern/kern_tc.c,v
retrieving revision 1.13
diff -u -r1.13 kern_tc.c
--- kern/kern_tc.c      14 Jan 2010 23:12:11 -0000      1.13
+++ kern/kern_tc.c      18 Apr 2010 20:12:02 -0000
@@ -12,6 +12,7 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
Index: kern/kern_watchdog.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/kern/kern_watchdog.c,v
retrieving revision 1.7
diff -u -r1.7 kern_watchdog.c
--- kern/kern_watchdog.c        21 Dec 2006 12:47:57 -0000      1.7
+++ kern/kern_watchdog.c        18 Apr 2010 20:11:54 -0000
@@ -26,6 +26,7 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 
Index: kern/subr_evcount.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/kern/subr_evcount.c,v
retrieving revision 1.8
diff -u -r1.8 subr_evcount.c
--- kern/subr_evcount.c 17 Oct 2006 10:29:50 -0000      1.8
+++ kern/subr_evcount.c 18 Apr 2010 20:11:43 -0000
@@ -30,6 +30,7 @@
 #include <sys/timeout.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 static TAILQ_HEAD(,evcount) evcount_list;
Index: kern/vfs_conf.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/kern/vfs_conf.c,v
retrieving revision 1.36
diff -u -r1.36 vfs_conf.c
--- kern/vfs_conf.c     3 Jun 2009 14:45:54 -0000       1.36
+++ kern/vfs_conf.c     18 Apr 2010 20:11:30 -0000
@@ -35,6 +35,7 @@
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
+#include <sys/timeout.h>
 
 #ifdef FFS
 #include <ufs/ufs/quota.h>
Index: net/if_pflow.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/net/if_pflow.c,v
retrieving revision 1.12
diff -u -r1.12 if_pflow.c
--- net/if_pflow.c      12 Jan 2010 02:47:07 -0000      1.12
+++ net/if_pflow.c      18 Apr 2010 19:50:51 -0000
@@ -20,10 +20,12 @@
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <dev/rndvar.h>
 
Index: net/if_trunk.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/net/if_trunk.c,v
retrieving revision 1.72
diff -u -r1.72 if_trunk.c
--- net/if_trunk.c      17 Apr 2010 17:47:03 -0000      1.72
+++ net/if_trunk.c      18 Apr 2010 20:10:17 -0000
@@ -26,7 +26,6 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/hash.h>
Index: net/if_vlan.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/net/if_vlan.c,v
retrieving revision 1.82
diff -u -r1.82 if_vlan.c
--- net/if_vlan.c       12 Jan 2010 01:36:33 -0000      1.82
+++ net/if_vlan.c       18 Apr 2010 20:10:28 -0000
@@ -57,7 +57,6 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 
Index: net80211/ieee80211_amrr.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/net80211/ieee80211_amrr.c,v
retrieving revision 1.5
diff -u -r1.5 ieee80211_amrr.c
--- net80211/ieee80211_amrr.c   27 Jul 2008 14:21:15 -0000      1.5
+++ net80211/ieee80211_amrr.c   18 Apr 2010 20:10:06 -0000
@@ -20,7 +20,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
Index: net80211/ieee80211_rssadapt.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/net80211/ieee80211_rssadapt.c,v
retrieving revision 1.7
diff -u -r1.7 ieee80211_rssadapt.c
--- net80211/ieee80211_rssadapt.c       1 Sep 2008 20:00:19 -0000       1.7
+++ net80211/ieee80211_rssadapt.c       18 Apr 2010 20:09:52 -0000
@@ -34,7 +34,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
Index: netinet/igmp.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/igmp.c,v
retrieving revision 1.30
diff -u -r1.30 igmp.c
--- netinet/igmp.c      13 Jan 2010 01:26:28 -0000      1.30
+++ netinet/igmp.c      18 Apr 2010 20:09:39 -0000
@@ -79,6 +79,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet/ip_divert.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_divert.c,v
retrieving revision 1.5
diff -u -r1.5 ip_divert.c
--- netinet/ip_divert.c 9 Mar 2010 12:36:12 -0000       1.5
+++ netinet/ip_divert.c 18 Apr 2010 20:09:31 -0000
@@ -22,6 +22,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet/ip_ether.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_ether.c,v
retrieving revision 1.52
diff -u -r1.52 ip_ether.c
--- netinet/ip_ether.c  21 Nov 2009 14:08:14 -0000      1.52
+++ netinet/ip_ether.c  18 Apr 2010 20:07:36 -0000
@@ -32,6 +32,7 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet/ip_gre.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_gre.c,v
retrieving revision 1.35
diff -u -r1.35 ip_gre.c
--- netinet/ip_gre.c    12 Jan 2010 23:33:24 -0000      1.35
+++ netinet/ip_gre.c    18 Apr 2010 20:08:27 -0000
@@ -46,6 +46,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <net/netisr.h>
Index: netinet/ip_icmp.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_icmp.c,v
retrieving revision 1.87
diff -u -r1.87 ip_icmp.c
--- netinet/ip_icmp.c   9 Feb 2010 13:23:39 -0000       1.87
+++ netinet/ip_icmp.c   18 Apr 2010 20:09:10 -0000
@@ -76,6 +76,7 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet/ip_input.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_input.c,v
retrieving revision 1.177
diff -u -r1.177 ip_input.c
--- netinet/ip_input.c  13 Jan 2010 10:31:17 -0000      1.177
+++ netinet/ip_input.c  18 Apr 2010 20:09:21 -0000
@@ -43,6 +43,7 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/pool.h>
 
Index: netinet/ip_ipip.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_ipip.c,v
retrieving revision 1.45
diff -u -r1.45 ip_ipip.c
--- netinet/ip_ipip.c   28 Jan 2010 23:23:54 -0000      1.45
+++ netinet/ip_ipip.c   18 Apr 2010 20:08:07 -0000
@@ -45,6 +45,7 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet/ip_ipsp.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_ipsp.c,v
retrieving revision 1.179
diff -u -r1.179 ip_ipsp.c
--- netinet/ip_ipsp.c   10 Jan 2010 12:43:07 -0000      1.179
+++ netinet/ip_ipsp.c   18 Apr 2010 20:08:18 -0000
@@ -44,6 +44,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet/ip_mroute.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ip_mroute.c,v
retrieving revision 1.56
diff -u -r1.56 ip_mroute.c
--- netinet/ip_mroute.c 1 Aug 2009 09:08:21 -0000       1.56
+++ netinet/ip_mroute.c 18 Apr 2010 20:09:00 -0000
@@ -72,6 +72,7 @@
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/timeout.h>
 
Index: netinet/ipsec_input.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/ipsec_input.c,v
retrieving revision 1.94
diff -u -r1.94 ipsec_input.c
--- netinet/ipsec_input.c       2 Jan 2010 18:35:48 -0000       1.94
+++ netinet/ipsec_input.c       18 Apr 2010 20:07:50 -0000
@@ -42,6 +42,7 @@
 #include <sys/protosw.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 
Index: netinet/tcp_usrreq.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.100
diff -u -r1.100 tcp_usrreq.c
--- netinet/tcp_usrreq.c        5 Jun 2009 00:05:22 -0000       1.100
+++ netinet/tcp_usrreq.c        18 Apr 2010 20:08:51 -0000
@@ -75,6 +75,7 @@
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/stat.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
Index: netinet/udp_usrreq.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.133
diff -u -r1.133 udp_usrreq.c
--- netinet/udp_usrreq.c        11 Mar 2010 00:24:58 -0000      1.133
+++ netinet/udp_usrreq.c        18 Apr 2010 20:08:40 -0000
@@ -74,6 +74,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet6/icmp6.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet6/icmp6.c,v
retrieving revision 1.110
diff -u -r1.110 icmp6.c
--- netinet6/icmp6.c    14 Jan 2010 04:27:32 -0000      1.110
+++ netinet6/icmp6.c    18 Apr 2010 20:04:58 -0000
@@ -2827,6 +2827,7 @@
 }
 
 #include <uvm/uvm_extern.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 int *icmpv6ctl_vars[ICMPV6CTL_MAXID] = ICMPV6CTL_VARS;
Index: netinet6/ip6_divert.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet6/ip6_divert.c,v
retrieving revision 1.3
diff -u -r1.3 ip6_divert.c
--- netinet6/ip6_divert.c       9 Mar 2010 12:36:12 -0000       1.3
+++ netinet6/ip6_divert.c       18 Apr 2010 20:05:12 -0000
@@ -22,6 +22,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet6/ip6_mroute.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet6/ip6_mroute.c,v
retrieving revision 1.55
diff -u -r1.55 ip6_mroute.c
--- netinet6/ip6_mroute.c       8 Feb 2010 12:16:02 -0000       1.55
+++ netinet6/ip6_mroute.c       18 Apr 2010 20:04:43 -0000
@@ -93,6 +93,7 @@
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: netinet6/raw_ip6.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.39
diff -u -r1.39 raw_ip6.c
--- netinet6/raw_ip6.c  5 Jun 2009 00:05:22 -0000       1.39
+++ netinet6/raw_ip6.c  18 Apr 2010 20:04:19 -0000
@@ -69,6 +69,7 @@
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
Index: ntfs/ntfs_vnops.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/ntfs/ntfs_vnops.c,v
retrieving revision 1.16
diff -u -r1.16 ntfs_vnops.c
--- ntfs/ntfs_vnops.c   13 Aug 2009 16:00:53 -0000      1.16
+++ ntfs/ntfs_vnops.c   18 Apr 2010 20:10:47 -0000
@@ -48,9 +48,6 @@
 #include <sys/buf.h>
 #include <sys/dirent.h>
 
-#include <sys/sysctl.h>
-
-
 /*#define NTFS_DEBUG 1*/
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_inode.h>
Index: sys/proc.h
===================================================================
RCS file: /home/tedu/cvs/src/sys/sys/proc.h,v
retrieving revision 1.125
diff -u -r1.125 proc.h
--- sys/proc.h  6 Apr 2010 22:26:59 -0000       1.125
+++ sys/proc.h  18 Apr 2010 20:22:04 -0000
@@ -48,7 +48,6 @@
 #include <sys/mutex.h>                 /* For struct mutex */
 #include <machine/atomic.h>
 
-#define curproc curcpu()->ci_curproc
 #ifdef _KERNEL
 #define __need_process
 #endif
@@ -422,7 +421,6 @@
 void   fixjobc(struct proc *p, struct pgrp *pgrp, int entering);
 int    inferior(struct proc *, struct proc *);
 int    leavepgrp(struct proc *p);
-void   yield(void);
 void   preempt(struct proc *);
 void   pgdelete(struct pgrp *pgrp);
 void   procinit(void);
Index: sys/systm.h
===================================================================
RCS file: /home/tedu/cvs/src/sys/sys/systm.h,v
retrieving revision 1.78
diff -u -r1.78 systm.h
--- sys/systm.h 6 Apr 2010 22:26:59 -0000       1.78
+++ sys/systm.h 18 Apr 2010 20:22:07 -0000
@@ -105,6 +105,7 @@
 extern struct vnode *swapdev_vp;/* vnode equivalent to above */
 
 struct proc;
+#define curproc curcpu()->ci_curproc
 
 typedef int    sy_call_t(struct proc *, void *, register_t *);
 
@@ -243,6 +244,7 @@
 #define wakeup_one(c) wakeup_n((c), 1)
 int    tsleep(const volatile void *, int, const char *, int);
 int    msleep(const volatile void *, struct mutex *, int,  const char*, int);
+void   yield(void);
 
 void   wdog_register(void *, int (*)(void *, int));
 
Index: ufs/ufs/ufs_lookup.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/ufs/ufs/ufs_lookup.c,v
retrieving revision 1.38
diff -u -r1.38 ufs_lookup.c
--- ufs/ufs/ufs_lookup.c        9 Jul 2009 22:29:56 -0000       1.38
+++ ufs/ufs/ufs_lookup.c        18 Apr 2010 20:06:27 -0000
@@ -45,6 +45,7 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
+#include <sys/proc.h>
 #include <sys/vnode.h>
 
 #include <uvm/uvm_extern.h>
Index: uvm/uvm_map.h
===================================================================
RCS file: /home/tedu/cvs/src/sys/uvm/uvm_map.h,v
retrieving revision 1.42
diff -u -r1.42 uvm_map.h
--- uvm/uvm_map.h       28 Aug 2009 00:40:03 -0000      1.42
+++ uvm/uvm_map.h       18 Apr 2010 19:45:09 -0000
@@ -338,7 +338,6 @@
 #ifdef _KERNEL
 /* XXX: clean up later */
 #include <sys/time.h>
-#include <sys/proc.h>  /* for tsleep(), wakeup() */
 #include <sys/systm.h> /* for panic() */
 
 static __inline boolean_t vm_map_lock_try(vm_map_t);
Index: uvm/uvm_page.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/uvm/uvm_page.c,v
retrieving revision 1.98
diff -u -r1.98 uvm_page.c
--- uvm/uvm_page.c      24 Mar 2010 00:36:04 -0000      1.98
+++ uvm/uvm_page.c      18 Apr 2010 20:05:58 -0000
@@ -78,6 +78,7 @@
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
+#include <sys/proc.h>
 
 #include <uvm/uvm.h>
 
Index: uvm/uvm_swap_encrypt.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/uvm/uvm_swap_encrypt.c,v
retrieving revision 1.15
diff -u -r1.15 uvm_swap_encrypt.c
--- uvm/uvm_swap_encrypt.c      23 Mar 2009 22:07:41 -0000      1.15
+++ uvm/uvm_swap_encrypt.c      18 Apr 2010 20:05:37 -0000
@@ -34,6 +34,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/conf.h>

Reply via email to