summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/amd64/bios.c3
-rw-r--r--sys/arch/amd64/amd64/est.c3
-rw-r--r--sys/arch/amd64/amd64/mp_setperf.c3
-rw-r--r--sys/arch/amd64/amd64/powernow-k8.c3
-rw-r--r--sys/arch/i386/i386/acpi_machdep.c3
-rw-r--r--sys/arch/i386/i386/amdmsr.c3
-rw-r--r--sys/arch/i386/i386/autoconf.c3
-rw-r--r--sys/arch/i386/i386/est.c3
-rw-r--r--sys/arch/i386/i386/longrun.c3
-rw-r--r--sys/arch/i386/i386/mp_setperf.c3
-rw-r--r--sys/arch/i386/i386/p4tcc.c3
-rw-r--r--sys/arch/i386/i386/powernow-k7.c3
-rw-r--r--sys/arch/i386/i386/powernow-k8.c3
-rw-r--r--sys/arch/i386/i386/powernow.c3
-rw-r--r--sys/arch/i386/i386/sg_dma.c3
-rw-r--r--sys/arch/i386/pci/elan520.c3
-rw-r--r--sys/arch/i386/pci/glxpcib.c3
-rw-r--r--sys/arch/i386/pci/ichpcib.c3
-rw-r--r--sys/arch/i386/pci/piixpcib.c3
-rw-r--r--sys/compat/aout/compat_aout.c3
-rw-r--r--sys/crypto/cryptodev.c3
-rw-r--r--sys/crypto/cryptosoft.c3
-rw-r--r--sys/crypto/xform.c3
-rw-r--r--sys/dev/ic/acx100.c3
-rw-r--r--sys/dev/ic/acx111.c4
-rw-r--r--sys/dev/ic/ar5416.c3
-rw-r--r--sys/dev/ic/ar5xxx.h4
-rw-r--r--sys/dev/ic/ar9280.c3
-rw-r--r--sys/dev/ic/ar9285.c3
-rw-r--r--sys/dev/ic/ar9287.c3
-rw-r--r--sys/dev/ic/ath.c3
-rw-r--r--sys/dev/ic/athn.c3
-rw-r--r--sys/dev/ic/pgt.c3
-rw-r--r--sys/dev/ic/rt2560.c3
-rw-r--r--sys/dev/ic/rt2661.c3
-rw-r--r--sys/dev/ic/rt2860.c3
-rw-r--r--sys/dev/pci/amdpcib.c3
-rw-r--r--sys/dev/pci/auglx.c3
-rw-r--r--sys/dev/pci/if_em.h3
-rw-r--r--sys/dev/pci/if_ipw.c3
-rw-r--r--sys/dev/pci/if_iwi.c3
-rw-r--r--sys/dev/pci/if_iwn.c3
-rw-r--r--sys/dev/pci/if_ixgb.h3
-rw-r--r--sys/dev/pci/if_wpi.c3
-rw-r--r--sys/dev/rnd.c3
-rw-r--r--sys/dev/usb/if_otus.c3
-rw-r--r--sys/dev/usb/if_ral.c3
-rw-r--r--sys/dev/usb/if_rum.c3
-rw-r--r--sys/dev/usb/if_run.c3
-rw-r--r--sys/dev/usb/if_uath.c3
-rw-r--r--sys/dev/usb/if_upgt.c3
-rw-r--r--sys/dev/usb/uberry.c3
-rw-r--r--sys/dev/usb/ucycom.c3
-rw-r--r--sys/kern/kern_tc.c3
-rw-r--r--sys/kern/kern_watchdog.c3
-rw-r--r--sys/kern/subr_evcount.c3
-rw-r--r--sys/kern/vfs_conf.c3
-rw-r--r--sys/net/if_pflow.c4
-rw-r--r--sys/net/if_trunk.c3
-rw-r--r--sys/net/if_vlan.c3
-rw-r--r--sys/net80211/ieee80211_amrr.c3
-rw-r--r--sys/net80211/ieee80211_rssadapt.c3
-rw-r--r--sys/netinet/igmp.c3
-rw-r--r--sys/netinet/ip_divert.c3
-rw-r--r--sys/netinet/ip_ether.c3
-rw-r--r--sys/netinet/ip_gre.c3
-rw-r--r--sys/netinet/ip_icmp.c3
-rw-r--r--sys/netinet/ip_input.c3
-rw-r--r--sys/netinet/ip_ipip.c3
-rw-r--r--sys/netinet/ip_ipsp.c3
-rw-r--r--sys/netinet/ip_mroute.c3
-rw-r--r--sys/netinet/ipsec_input.c3
-rw-r--r--sys/netinet/tcp_usrreq.c3
-rw-r--r--sys/netinet/udp_usrreq.c3
-rw-r--r--sys/netinet6/icmp6.c3
-rw-r--r--sys/netinet6/ip6_divert.c3
-rw-r--r--sys/netinet6/ip6_mroute.c1
-rw-r--r--sys/netinet6/raw_ip6.c3
-rw-r--r--sys/ntfs/ntfs_vnops.c5
-rw-r--r--sys/sys/proc.h4
-rw-r--r--sys/sys/systm.h4
-rw-r--r--sys/ufs/ufs/ufs_lookup.c3
-rw-r--r--sys/uvm/uvm_map.h3
-rw-r--r--sys/uvm/uvm_page.c3
-rw-r--r--sys/uvm/uvm_swap_encrypt.c3
85 files changed, 133 insertions, 127 deletions
diff --git a/sys/arch/amd64/amd64/bios.c b/sys/arch/amd64/amd64/bios.c
index 47cd638ebb8..8ead81728dd 100644
--- a/sys/arch/amd64/amd64/bios.c
+++ b/sys/arch/amd64/amd64/bios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bios.c,v 1.19 2010/03/28 12:08:49 kettenis Exp $ */
+/* $OpenBSD: bios.c,v 1.20 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
*
@@ -23,6 +23,7 @@
#include <sys/malloc.h>
#include <uvm/uvm_extern.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <machine/conf.h>
diff --git a/sys/arch/amd64/amd64/est.c b/sys/arch/amd64/amd64/est.c
index 7d0a0172c0f..4e1283738e6 100644
--- a/sys/arch/amd64/amd64/est.c
+++ b/sys/arch/amd64/amd64/est.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: est.c,v 1.18 2010/03/28 03:09:50 marco Exp $ */
+/* $OpenBSD: est.c,v 1.19 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2003 Michael Eriksson.
* All rights reserved.
@@ -55,6 +55,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/malloc.h>
diff --git a/sys/arch/amd64/amd64/mp_setperf.c b/sys/arch/amd64/amd64/mp_setperf.c
index 4484dc0676b..a98b57e0ba7 100644
--- a/sys/arch/amd64/amd64/mp_setperf.c
+++ b/sys/arch/amd64/amd64/mp_setperf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mp_setperf.c,v 1.2 2009/06/06 20:37:45 gwk Exp $ */
+/* $OpenBSD: mp_setperf.c,v 1.3 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd.org>
*
@@ -17,6 +17,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/mutex.h>
diff --git a/sys/arch/amd64/amd64/powernow-k8.c b/sys/arch/amd64/amd64/powernow-k8.c
index 90ab3aa719e..1e0875c9d05 100644
--- a/sys/arch/amd64/amd64/powernow-k8.c
+++ b/sys/arch/amd64/amd64/powernow-k8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k8.c,v 1.21 2008/06/29 03:50:49 gwk Exp $ */
+/* $OpenBSD: powernow-k8.c,v 1.22 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2004 Martin Végiard.
* Copyright (c) 2004-2005 Bruno Ducrot
@@ -30,6 +30,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>
diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c
index 23d0e882de4..d7caf9980c2 100644
--- a/sys/arch/i386/i386/acpi_machdep.c
+++ b/sys/arch/i386/i386/acpi_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi_machdep.c,v 1.29 2010/04/07 06:33:06 kettenis Exp $ */
+/* $OpenBSD: acpi_machdep.c,v 1.30 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -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>
diff --git a/sys/arch/i386/i386/amdmsr.c b/sys/arch/i386/i386/amdmsr.c
index 48fd565c24e..77eeca48d35 100644
--- a/sys/arch/i386/i386/amdmsr.c
+++ b/sys/arch/i386/i386/amdmsr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdmsr.c,v 1.8 2008/07/01 12:03:48 mbalmer Exp $ */
+/* $OpenBSD: amdmsr.c,v 1.9 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -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>
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 67d5e0161ed..d357d5a30d3 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.81 2008/07/21 04:35:54 todd Exp $ */
+/* $OpenBSD: autoconf.c,v 1.82 2010/04/20 22:05:41 tedu Exp $ */
/* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */
/*-
@@ -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>
diff --git a/sys/arch/i386/i386/est.c b/sys/arch/i386/i386/est.c
index e8d331ccb6d..e8eaf83e465 100644
--- a/sys/arch/i386/i386/est.c
+++ b/sys/arch/i386/i386/est.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: est.c,v 1.34 2010/03/28 03:09:50 marco Exp $ */
+/* $OpenBSD: est.c,v 1.35 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2003 Michael Eriksson.
* All rights reserved.
@@ -55,6 +55,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/malloc.h>
diff --git a/sys/arch/i386/i386/longrun.c b/sys/arch/i386/i386/longrun.c
index 8c752df0e9b..5f775e93aa0 100644
--- a/sys/arch/i386/i386/longrun.c
+++ b/sys/arch/i386/i386/longrun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: longrun.c,v 1.14 2008/09/10 14:01:22 blambert Exp $ */
+/* $OpenBSD: longrun.c,v 1.15 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2003 Ted Unangst
* Copyright (c) 2001 Tamotsu Hattori
@@ -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>
diff --git a/sys/arch/i386/i386/mp_setperf.c b/sys/arch/i386/i386/mp_setperf.c
index c325f07732f..ca657b36c62 100644
--- a/sys/arch/i386/i386/mp_setperf.c
+++ b/sys/arch/i386/i386/mp_setperf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mp_setperf.c,v 1.3 2009/06/06 20:37:45 gwk Exp $ */
+/* $OpenBSD: mp_setperf.c,v 1.4 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd.org>
*
@@ -17,6 +17,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/mutex.h>
diff --git a/sys/arch/i386/i386/p4tcc.c b/sys/arch/i386/i386/p4tcc.c
index bee0b595c0c..cf5ddad8ab4 100644
--- a/sys/arch/i386/i386/p4tcc.c
+++ b/sys/arch/i386/i386/p4tcc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p4tcc.c,v 1.16 2009/11/12 04:13:15 deraadt Exp $ */
+/* $OpenBSD: p4tcc.c,v 1.17 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2003 Ted Unangst
* All rights reserved.
@@ -37,6 +37,7 @@
*/
#include <sys/param.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <machine/cpu.h>
diff --git a/sys/arch/i386/i386/powernow-k7.c b/sys/arch/i386/i386/powernow-k7.c
index 4babb868c9a..27553f75516 100644
--- a/sys/arch/i386/i386/powernow-k7.c
+++ b/sys/arch/i386/i386/powernow-k7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k7.c,v 1.33 2007/09/07 03:50:42 gwk Exp $ */
+/* $OpenBSD: powernow-k7.c,v 1.34 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2004 Martin Végiard.
@@ -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>
diff --git a/sys/arch/i386/i386/powernow-k8.c b/sys/arch/i386/i386/powernow-k8.c
index d2889b9d5e8..7e74d013cfe 100644
--- a/sys/arch/i386/i386/powernow-k8.c
+++ b/sys/arch/i386/i386/powernow-k8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k8.c,v 1.25 2008/06/29 03:50:49 gwk Exp $ */
+/* $OpenBSD: powernow-k8.c,v 1.26 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2004 Martin Végiard.
@@ -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>
diff --git a/sys/arch/i386/i386/powernow.c b/sys/arch/i386/i386/powernow.c
index 85dc628d5dd..bf20f220e32 100644
--- a/sys/arch/i386/i386/powernow.c
+++ b/sys/arch/i386/i386/powernow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow.c,v 1.3 2006/12/12 23:14:27 dim Exp $ */
+/* $OpenBSD: powernow.c,v 1.4 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2004 Ted Unangst
* All rights reserved.
@@ -22,6 +22,7 @@
*/
#include <sys/param.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <machine/cpu.h>
diff --git a/sys/arch/i386/i386/sg_dma.c b/sys/arch/i386/i386/sg_dma.c
index 313564f0ab6..9f924258ebe 100644
--- a/sys/arch/i386/i386/sg_dma.c
+++ b/sys/arch/i386/i386/sg_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sg_dma.c,v 1.5 2010/04/08 00:55:25 oga Exp $ */
+/* $OpenBSD: sg_dma.c,v 1.6 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2009 Owain G. Ainsworth <oga@openbsd.org>
*
@@ -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>
diff --git a/sys/arch/i386/pci/elan520.c b/sys/arch/i386/pci/elan520.c
index 9c628ba2368..a0c57db6e43 100644
--- a/sys/arch/i386/pci/elan520.c
+++ b/sys/arch/i386/pci/elan520.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elan520.c,v 1.16 2009/01/14 07:58:45 grange Exp $ */
+/* $OpenBSD: elan520.c,v 1.17 2010/04/20 22:05:41 tedu Exp $ */
/* $NetBSD: elan520.c,v 1.4 2002/10/02 05:47:15 thorpej Exp $ */
/*-
@@ -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>
diff --git a/sys/arch/i386/pci/glxpcib.c b/sys/arch/i386/pci/glxpcib.c
index b8b0f92079e..157ee0d7aea 100644
--- a/sys/arch/i386/pci/glxpcib.c
+++ b/sys/arch/i386/pci/glxpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glxpcib.c,v 1.8 2010/02/21 18:36:57 miod Exp $ */
+/* $OpenBSD: glxpcib.c,v 1.9 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -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>
diff --git a/sys/arch/i386/pci/ichpcib.c b/sys/arch/i386/pci/ichpcib.c
index 2fae05cb879..3bdd1e4bf08 100644
--- a/sys/arch/i386/pci/ichpcib.c
+++ b/sys/arch/i386/pci/ichpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ichpcib.c,v 1.23 2008/01/04 00:23:25 kettenis Exp $ */
+/* $OpenBSD: ichpcib.c,v 1.24 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
*
@@ -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>
diff --git a/sys/arch/i386/pci/piixpcib.c b/sys/arch/i386/pci/piixpcib.c
index 09efa939470..a8844ecb353 100644
--- a/sys/arch/i386/pci/piixpcib.c
+++ b/sys/arch/i386/pci/piixpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: piixpcib.c,v 1.5 2009/10/31 12:26:36 sobrado Exp $ */
+/* $OpenBSD: piixpcib.c,v 1.6 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2007 Stefan Sperling <stsp@stsp.in-berlin.de>
@@ -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>
diff --git a/sys/compat/aout/compat_aout.c b/sys/compat/aout/compat_aout.c
index 924d5d228d0..19788a7eff4 100644
--- a/sys/compat/aout/compat_aout.c
+++ b/sys/compat/aout/compat_aout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat_aout.c,v 1.3 2009/03/05 19:52:23 kettenis Exp $ */
+/* $OpenBSD: compat_aout.c,v 1.4 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2003 Marc Espie
@@ -25,6 +25,7 @@
*
*/
#include <sys/param.h>
+#include <sys/proc.h>
#include <sys/syscall.h>
#include <sys/signalvar.h>
#include <sys/mount.h>
diff --git a/sys/crypto/cryptodev.c b/sys/crypto/cryptodev.c
index 5a86590e8f0..b76218bc09d 100644
--- a/sys/crypto/cryptodev.c
+++ b/sys/crypto/cryptodev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptodev.c,v 1.70 2009/02/17 19:16:26 deraadt Exp $ */
+/* $OpenBSD: cryptodev.c,v 1.71 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2001 Theo de Raadt
@@ -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>
diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c
index e392747d7c5..b5627b84ad3 100644
--- a/sys/crypto/cryptosoft.c
+++ b/sys/crypto/cryptosoft.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptosoft.c,v 1.52 2010/01/10 12:43:07 markus Exp $ */
+/* $OpenBSD: cryptosoft.c,v 1.53 2010/04/20 22:05:41 tedu Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -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>
diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c
index dd5bb9aa054..437e9ea8844 100644
--- a/sys/crypto/xform.c
+++ b/sys/crypto/xform.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xform.c,v 1.37 2010/01/10 12:43:07 markus Exp $ */
+/* $OpenBSD: xform.c,v 1.38 2010/04/20 22:05:41 tedu Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -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>
diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c
index bc1f1110b2b..97c0e96749d 100644
--- a/sys/dev/ic/acx100.c
+++ b/sys/dev/ic/acx100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx100.c,v 1.20 2007/07/18 19:24:21 damien Exp $ */
+/* $OpenBSD: acx100.c,v 1.21 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -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>
diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c
index 1288f1f66e5..4990a627d7f 100644
--- a/sys/dev/ic/acx111.c
+++ b/sys/dev/ic/acx111.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx111.c,v 1.17 2008/06/01 10:17:45 brad Exp $ */
+/* $OpenBSD: acx111.c,v 1.18 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -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>
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c
index ab9b92eb207..12f88985598 100644
--- a/sys/dev/ic/ar5416.c
+++ b/sys/dev/ic/ar5416.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5416.c,v 1.6 2010/04/19 16:41:19 damien Exp $ */
+/* $OpenBSD: ar5416.c,v 1.7 2010/04/20 22:05:41 tedu Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h
index 7da71e7e2df..c72772de1d3 100644
--- a/sys/dev/ic/ar5xxx.h
+++ b/sys/dev/ic/ar5xxx.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5xxx.h,v 1.47 2009/07/24 16:31:27 jsg Exp $ */
+/* $OpenBSD: ar5xxx.h,v 1.48 2010/04/20 22:05:41 tedu Exp $ */
/*
* Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -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>
diff --git a/sys/dev/ic/ar9280.c b/sys/dev/ic/ar9280.c
index b61fe59cec2..138ad789e72 100644
--- a/sys/dev/ic/ar9280.c
+++ b/sys/dev/ic/ar9280.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar9280.c,v 1.3 2009/11/17 19:32:22 damien Exp $ */
+/* $OpenBSD: ar9280.c,v 1.4 2010/04/20 22:05:41 tedu Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c
index 432e4af1dad..f9442fa8bac 100644
--- a/sys/dev/ic/ar9285.c
+++ b/sys/dev/ic/ar9285.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar9285.c,v 1.6 2010/04/07 16:19:33 damien Exp $ */
+/* $OpenBSD: ar9285.c,v 1.7 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2009-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c
index 439feceec10..bd05d37ba3e 100644
--- a/sys/dev/ic/ar9287.c
+++ b/sys/dev/ic/ar9287.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar9287.c,v 1.7 2010/04/05 19:09:00 damien Exp $ */
+/* $OpenBSD: ar9287.c,v 1.8 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 72326b17d57..64640c2fea1 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ath.c,v 1.84 2009/10/13 19:33:16 pirofti Exp $ */
+/* $OpenBSD: ath.c,v 1.85 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */
/*-
@@ -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>
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index 6062748800b..0bddedd1e54 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: athn.c,v 1.35 2010/04/10 19:07:24 damien Exp $ */
+/* $OpenBSD: athn.c,v 1.36 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index afc75aaf266..318e179cd14 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgt.c,v 1.57 2010/03/29 23:33:39 krw Exp $ */
+/* $OpenBSD: pgt.c,v 1.58 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -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>
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 561e82b87b8..ecc79997eb0 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2560.c,v 1.46 2009/11/01 12:08:36 damien Exp $ */
+/* $OpenBSD: rt2560.c,v 1.47 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -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>
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 41122311efe..80124d98ab6 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2661.c,v 1.52 2010/02/14 09:20:34 damien Exp $ */
+/* $OpenBSD: rt2661.c,v 1.53 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2006
@@ -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>
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index ab0a4e2a9c6..728055f8917 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2860.c,v 1.51 2010/04/12 18:02:31 damien Exp $ */
+/* $OpenBSD: rt2860.c,v 1.52 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/pci/amdpcib.c b/sys/dev/pci/amdpcib.c
index 36d4ac03009..c6ac0cfceff 100644
--- a/sys/dev/pci/amdpcib.c
+++ b/sys/dev/pci/amdpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdpcib.c,v 1.1 2007/10/07 18:41:06 mbalmer Exp $ */
+/* $OpenBSD: amdpcib.c,v 1.2 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2007 Michael Shalayeff
@@ -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>
diff --git a/sys/dev/pci/auglx.c b/sys/dev/pci/auglx.c
index 40a2ef5d3a8..b5159624a08 100644
--- a/sys/dev/pci/auglx.c
+++ b/sys/dev/pci/auglx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auglx.c,v 1.2 2010/02/19 15:02:37 miod Exp $ */
+/* $OpenBSD: auglx.c,v 1.3 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -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>
diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h
index 4c2355e6a21..e2e5e5de94d 100644
--- a/sys/dev/pci/if_em.h
+++ b/sys/dev/pci/if_em.h
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
/* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */
-/* $OpenBSD: if_em.h,v 1.46 2009/11/25 13:28:13 dms Exp $ */
+/* $OpenBSD: if_em.h,v 1.47 2010/04/20 22:05:43 tedu Exp $ */
#ifndef _EM_H_DEFINED_
#define _EM_H_DEFINED_
@@ -48,6 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
#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>
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 4400755118a..fa131e7d59a 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ipw.c,v 1.85 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: if_ipw.c,v 1.86 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2004-2008
@@ -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>
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index d54768d8871..68c181949df 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwi.c,v 1.101 2009/05/11 19:24:57 damien Exp $ */
+/* $OpenBSD: if_iwi.c,v 1.102 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2004-2008
@@ -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>
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index e681e1a2d50..d9247671e84 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwn.c,v 1.88 2010/04/10 08:37:36 damien Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.89 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/pci/if_ixgb.h b/sys/dev/pci/if_ixgb.h
index 9f1bf0ecc27..da595b1530f 100644
--- a/sys/dev/pci/if_ixgb.h
+++ b/sys/dev/pci/if_ixgb.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_ixgb.h,v 1.11 2009/08/10 19:41:05 deraadt Exp $ */
+/* $OpenBSD: if_ixgb.h,v 1.12 2010/04/20 22:05:43 tedu Exp $ */
#ifndef _IXGB_H_DEFINED_
#define _IXGB_H_DEFINED_
@@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
#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>
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index b9871efd4af..51aa491c83a 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wpi.c,v 1.99 2009/11/17 20:35:51 damien Exp $ */
+/* $OpenBSD: if_wpi.c,v 1.100 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2006-2008
@@ -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>
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index 25c8e8ff9fc..02d717cf1f1 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rnd.c,v 1.101 2009/11/09 17:53:39 nicm Exp $ */
+/* $OpenBSD: rnd.c,v 1.102 2010/04/20 22:05:41 tedu Exp $ */
/*
* rnd.c -- A strong random number generator
@@ -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>
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index 777bdc16423..7c9aaad08e0 100644
--- a/sys/dev/usb/if_otus.c
+++ b/sys/dev/usb/if_otus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_otus.c,v 1.16 2010/04/14 20:01:07 damien Exp $ */
+/* $OpenBSD: if_otus.c,v 1.17 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 59a25ce5aa5..7f16572aef0 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ral.c,v 1.111 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: if_ral.c,v 1.112 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -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>
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 18971027010..6b8e018c6a4 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rum.c,v 1.87 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: if_rum.c,v 1.88 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 57453f896c5..392d8d656a4 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_run.c,v 1.68 2010/04/15 17:46:53 damien Exp $ */
+/* $OpenBSD: if_run.c,v 1.69 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -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>
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index e11c96bf04c..9cdbcda6640 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_uath.c,v 1.40 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: if_uath.c,v 1.41 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2006
@@ -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>
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index 1dc4051a3e7..59ef36f35d4 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/dev/usb/if_upgt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_upgt.c,v 1.48 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -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>
diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c
index 8e6644823d5..e0b23a58a0b 100644
--- a/sys/dev/usb/uberry.c
+++ b/sys/dev/usb/uberry.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uberry.c,v 1.16 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: uberry.c,v 1.17 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -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>
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 14bd22d50cd..70c3d77165f 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucycom.c,v 1.15 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: ucycom.c,v 1.16 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */
/*
@@ -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>
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 55d8d70fbf5..25f987ac195 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -6,12 +6,13 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $OpenBSD: kern_tc.c,v 1.13 2010/01/14 23:12:11 schwarze Exp $
+ * $OpenBSD: kern_tc.c,v 1.14 2010/04/20 22:05:43 tedu Exp $
* $FreeBSD: src/sys/kern/kern_tc.c,v 1.148 2003/03/18 08:45:23 phk Exp $
*/
#include <sys/param.h>
#include <sys/kernel.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/syslog.h>
#include <sys/systm.h>
diff --git a/sys/kern/kern_watchdog.c b/sys/kern/kern_watchdog.c
index cb48d10b8dc..af2fc703afb 100644
--- a/sys/kern/kern_watchdog.c
+++ b/sys/kern/kern_watchdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_watchdog.c,v 1.7 2006/12/21 12:47:57 mbalmer Exp $ */
+/* $OpenBSD: kern_watchdog.c,v 1.8 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -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>
diff --git a/sys/kern/subr_evcount.c b/sys/kern/subr_evcount.c
index c63fe993864..1fb6a8f7494 100644
--- a/sys/kern/subr_evcount.c
+++ b/sys/kern/subr_evcount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_evcount.c,v 1.8 2006/10/17 10:29:50 grange Exp $ */
+/* $OpenBSD: subr_evcount.c,v 1.9 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
* Copyright (c) 2004 Aaron Campbell <aaron@openbsd.org>
@@ -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;
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index bc50315c89a..00b00c24939 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_conf.c,v 1.36 2009/06/03 14:45:54 jj Exp $ */
+/* $OpenBSD: vfs_conf.c,v 1.37 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: vfs_conf.c,v 1.21.4.1 1995/11/01 00:06:26 jtc Exp $ */
/*
@@ -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>
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index dfb386f7c41..9b513c8202a 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflow.c,v 1.12 2010/01/12 02:47:07 claudio Exp $ */
+/* $OpenBSD: if_pflow.c,v 1.13 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2008 Henning Brauer <henning@openbsd.org>
@@ -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>
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index 74954514111..cc16389b7a0 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.c,v 1.72 2010/04/17 17:47:03 deraadt Exp $ */
+/* $OpenBSD: if_trunk.c,v 1.73 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -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>
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 6c08dbbce0e..8fb09cba298 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.82 2010/01/12 01:36:33 dlg Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.83 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
@@ -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>
diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c
index 2603b5d723f..3afff350864 100644
--- a/sys/net80211/ieee80211_amrr.c
+++ b/sys/net80211/ieee80211_amrr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_amrr.c,v 1.5 2008/07/27 14:21:15 damien Exp $ */
+/* $OpenBSD: ieee80211_amrr.c,v 1.6 2010/04/20 22:05:43 tedu Exp $ */
/*-
* Copyright (c) 2006
@@ -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>
diff --git a/sys/net80211/ieee80211_rssadapt.c b/sys/net80211/ieee80211_rssadapt.c
index f9b347cd9b5..c7c03e325ad 100644
--- a/sys/net80211/ieee80211_rssadapt.c
+++ b/sys/net80211/ieee80211_rssadapt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_rssadapt.c,v 1.7 2008/09/01 20:00:19 damien Exp $ */
+/* $OpenBSD: ieee80211_rssadapt.c,v 1.8 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: ieee80211_rssadapt.c,v 1.7 2004/05/25 04:33:59 dyoung Exp $ */
/*-
@@ -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>
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 6ba84beaec9..f937cd4bdd7 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: igmp.c,v 1.30 2010/01/13 01:26:28 henning Exp $ */
+/* $OpenBSD: igmp.c,v 1.31 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $ */
/*
@@ -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>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index f44244f0f14..805a99e339e 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_divert.c,v 1.5 2010/03/09 12:36:12 jsing Exp $ */
+/* $OpenBSD: ip_divert.c,v 1.6 2010/04/20 22:05:43 tedu Exp $ */
/*
* Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -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>
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c
index a0afea77c80..d337aee1bac 100644
--- a/sys/netinet/ip_ether.c
+++ b/sys/netinet/ip_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ether.c,v 1.52 2009/11/21 14:08:14 claudio Exp $ */
+/* $OpenBSD: ip_ether.c,v 1.53 2010/04/20 22:05:43 tedu Exp $ */
/*
* The author of this code is Angelos D. Keromytis (kermit@adk.gr)
*
@@ -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>
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index 4309641dc0c..cafb7b8eaec 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_gre.c,v 1.35 2010/01/12 23:33:24 yasuoka Exp $ */
+/* $OpenBSD: ip_gre.c,v 1.36 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -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>
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index ac67e4333e7..4c5a65c72d8 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_icmp.c,v 1.87 2010/02/09 13:23:39 claudio Exp $ */
+/* $OpenBSD: ip_icmp.c,v 1.88 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $ */
/*
@@ -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>
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 0f16eb76b12..5966fdd6596 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_input.c,v 1.177 2010/01/13 10:31:17 henning Exp $ */
+/* $OpenBSD: ip_input.c,v 1.178 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */
/*
@@ -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>
diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c
index bfc586a86f1..b67f20a566a 100644
--- a/sys/netinet/ip_ipip.c
+++ b/sys/netinet/ip_ipip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipip.c,v 1.45 2010/01/28 23:23:54 chl Exp $ */
+/* $OpenBSD: ip_ipip.c,v 1.46 2010/04/20 22:05:43 tedu Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -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>
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index f506ad50e36..40df7b69f7b 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.c,v 1.179 2010/01/10 12:43:07 markus Exp $ */
+/* $OpenBSD: ip_ipsp.c,v 1.180 2010/04/20 22:05:43 tedu Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -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>
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index fef0bb2b247..f31a172a6f6 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_mroute.c,v 1.56 2009/08/01 09:08:21 blambert Exp $ */
+/* $OpenBSD: ip_mroute.c,v 1.57 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */
/*
@@ -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>
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index f803a79a8c3..23420f9fd3c 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec_input.c,v 1.94 2010/01/02 18:35:48 markus Exp $ */
+/* $OpenBSD: ipsec_input.c,v 1.95 2010/04/20 22:05:43 tedu Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -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>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index facb9830def..e177c75373f 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_usrreq.c,v 1.100 2009/06/05 00:05:22 claudio Exp $ */
+/* $OpenBSD: tcp_usrreq.c,v 1.101 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */
/*
@@ -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>
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 1df5ac82c8c..831ff59126a 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp_usrreq.c,v 1.133 2010/03/11 00:24:58 sthen Exp $ */
+/* $OpenBSD: udp_usrreq.c,v 1.134 2010/04/20 22:05:43 tedu Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
/*
@@ -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>
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index a65df1f2b51..e1dbd22f320 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.110 2010/01/14 04:27:32 jsing Exp $ */
+/* $OpenBSD: icmp6.c,v 1.111 2010/04/20 22:05:43 tedu Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -2827,6 +2827,7 @@ icmp6_redirect_timeout(struct rtentry *rt, struct rttimer *r)
}
#include <uvm/uvm_extern.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
int *icmpv6ctl_vars[ICMPV6CTL_MAXID] = ICMPV6CTL_VARS;
diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c
index b949f873e08..8c6a3668107 100644
--- a/sys/netinet6/ip6_divert.c
+++ b/sys/netinet6/ip6_divert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_divert.c,v 1.3 2010/03/09 12:36:12 jsing Exp $ */
+/* $OpenBSD: ip6_divert.c,v 1.4 2010/04/20 22:05:44 tedu Exp $ */
/*
* Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -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>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index c45da4f81f3..5d9d40b70b1 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -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>
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index ec91971dd13..03fcef73030 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ip6.c,v 1.39 2009/06/05 00:05:22 claudio Exp $ */
+/* $OpenBSD: raw_ip6.c,v 1.40 2010/04/20 22:05:44 tedu Exp $ */
/* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */
/*
@@ -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>
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index 8ca8d9e498c..bff182d7c34 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_vnops.c,v 1.16 2009/08/13 16:00:53 jasper Exp $ */
+/* $OpenBSD: ntfs_vnops.c,v 1.17 2010/04/20 22:05:44 tedu Exp $ */
/* $NetBSD: ntfs_vnops.c,v 1.6 2003/04/10 21:57:26 jdolecek Exp $ */
/*
@@ -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>
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index a473bc6e89a..6ee8bded551 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.125 2010/04/06 22:26:59 tedu Exp $ */
+/* $OpenBSD: proc.h,v 1.126 2010/04/20 22:05:44 tedu Exp $ */
/* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */
/*-
@@ -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 @@ int enterpgrp(struct proc *p, pid_t pgid, struct pgrp *newpgrp,
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);
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index bea53292d88..5b118286d60 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: systm.h,v 1.78 2010/04/06 22:26:59 tedu Exp $ */
+/* $OpenBSD: systm.h,v 1.79 2010/04/20 22:05:44 tedu Exp $ */
/* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */
/*-
@@ -105,6 +105,7 @@ extern dev_t swapdev; /* swapping device */
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 @@ void wakeup(const volatile void *);
#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));
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index a1eb019de51..34c7853605f 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_lookup.c,v 1.38 2009/07/09 22:29:56 thib Exp $ */
+/* $OpenBSD: ufs_lookup.c,v 1.39 2010/04/20 22:05:44 tedu Exp $ */
/* $NetBSD: ufs_lookup.c,v 1.7 1996/02/09 22:36:06 christos Exp $ */
/*
@@ -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>
diff --git a/sys/uvm/uvm_map.h b/sys/uvm/uvm_map.h
index a13250b83bc..0838713311b 100644
--- a/sys/uvm/uvm_map.h
+++ b/sys/uvm/uvm_map.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_map.h,v 1.42 2009/08/28 00:40:03 ariane Exp $ */
+/* $OpenBSD: uvm_map.h,v 1.43 2010/04/20 22:05:44 tedu Exp $ */
/* $NetBSD: uvm_map.h,v 1.24 2001/02/18 21:19:08 chs Exp $ */
/*
@@ -338,7 +338,6 @@ void uvm_unmap_remove(vm_map_t, vaddr_t, vaddr_t, vm_map_entry_t *,
#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);
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index 7e95c431d18..467e072ff43 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_page.c,v 1.98 2010/03/24 00:36:04 oga Exp $ */
+/* $OpenBSD: uvm_page.c,v 1.99 2010/04/20 22:05:44 tedu Exp $ */
/* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */
/*
@@ -78,6 +78,7 @@
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/mount.h>
+#include <sys/proc.h>
#include <uvm/uvm.h>
diff --git a/sys/uvm/uvm_swap_encrypt.c b/sys/uvm/uvm_swap_encrypt.c
index 66acf3880ae..85f5332385f 100644
--- a/sys/uvm/uvm_swap_encrypt.c
+++ b/sys/uvm/uvm_swap_encrypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap_encrypt.c,v 1.15 2009/03/23 22:07:41 oga Exp $ */
+/* $OpenBSD: uvm_swap_encrypt.c,v 1.16 2010/04/20 22:05:44 tedu Exp $ */
/*
* Copyright 1999 Niels Provos <provos@citi.umich.edu>
@@ -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>