7 files changed, 39 insertions, 35 deletions

diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index b851d29db37cf..8bdb3a7c5c23e 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -25,12 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_file.c,v 1.2 1995/08/28 00:50:08 swallace Exp $
+ *  $Id: linux_file.c,v 1.3 1995/10/10 23:13:27 swallace Exp $
  */
 
-#include <i386/linux/linux.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
@@ -41,9 +41,11 @@
 #include <sys/malloc.h>
 #include <sys/exec.h>
 #include <sys/dirent.h>
-#include <vm/vm.h>
+
 #include <ufs/ufs/dir.h>
 
+#include <i386/linux/linux.h>
+#include <i386/linux/sysproto.h>
 
 struct linux_creat_args {
     char    *path;
@@ -386,7 +388,8 @@ again:
     auio.uio_resid = buflen;
     auio.uio_offset = off - (off_t)blockoff;
 
-    error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, 0, 0);
+    error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, (int *) NULL,
+			(u_int **) NULL);
     if (error) {
 	goto out;
 }
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 12adff4a18a85..e018051ada2c8 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -25,12 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.2 1995/06/07 21:27:57 sos Exp $
+ *  $Id: linux_ioctl.c,v 1.1 1995/06/25 17:32:35 sos Exp $
  */
 
-#include <i386/linux/linux.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/ioctl_compat.h>
@@ -38,8 +38,11 @@
 #include <sys/filedesc.h>
 #include <sys/tty.h>
 #include <sys/termios.h>
+
 #include <machine/console.h>
 
+#include <i386/linux/linux.h>
+#include <i386/linux/sysproto.h>
 
 struct linux_termios {
     unsigned long   c_iflag;
@@ -363,7 +366,7 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
     struct linux_winsize linux_winsize;
     struct filedesc *fdp = p->p_fd;
     struct file *fp;
-    int (*func)();
+    int (*func)(struct file *fp, int com, caddr_t data, struct proc *p);
     int bsd_line, linux_line;
     int error;
 
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index b38b229c691f5..339dbee05fece 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -25,19 +25,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ipc.c,v 1.2 1995/06/07 21:27:57 sos Exp $
+ *  $Id: linux_ipc.c,v 1.1 1995/06/25 17:32:36 sos Exp $
  */
 
-#include <i386/linux/linux.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
+#include <sys/sysproto.h>
 #include <sys/proc.h>
-#include <sys/sem.h>
 #include <sys/shm.h>
-#include <sys/msg.h>
 
-#include <vm/vm.h>
+#include <i386/linux/linux.h>
+#include <i386/linux/sysproto.h>
 
 struct linux_ipc_perm {
     linux_key_t key;
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 89ab5d864ef49..5e04b263975a7 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.2 1995/10/04 07:08:04 julian Exp $
+ *  $Id: linux_misc.c,v 1.3 1995/11/06 12:52:24 davidg Exp $
  */
 
-#include <i386/linux/linux.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
+#include <sys/kernel.h>
 #include <sys/exec.h>
 #include <sys/mman.h>
 #include <sys/proc.h>
@@ -44,19 +45,19 @@
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <sys/sysctl.h>
 #include <sys/times.h>
 #include <sys/utsname.h>
 #include <sys/vnode.h>
 #include <sys/wait.h>
 
+#include <vm/vm_kern.h>
+
 #include <machine/cpu.h>
 #include <machine/psl.h>
-#include <machine/reg.h>
-
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
 
+#include <i386/linux/linux.h>
+#include <i386/linux/sysproto.h>
 
 struct linux_alarm_args {
     unsigned int secs;
@@ -65,7 +66,6 @@ struct linux_alarm_args {
 int
 linux_alarm(struct proc *p, struct linux_alarm_args *args, int *retval)
 {
-    extern struct timeval time;
     struct itimerval it, old_it;
     int s;
 
@@ -111,7 +111,6 @@ linux_brk(struct proc *p, struct linux_brk_args *args, int *retval)
     struct vmspace *vm = p->p_vmspace;
     vm_offset_t new, old;
     int error;
-    extern int swap_pager_full;
 
     if ((vm_offset_t)args->dsend < (vm_offset_t)vm->vm_daddr)
 	return EINVAL;
@@ -513,7 +512,6 @@ struct linux_tms_args {
 int
 linux_times(struct proc *p, struct linux_tms_args *args, int *retval)
 {
-    extern int hz;
     struct timeval tv;
     struct linux_tms tms;
 
@@ -549,8 +547,6 @@ int
 linux_newuname(struct proc *p, struct linux_newuname_args *args, int *retval)
 {
     struct linux_newuname_t linux_newuname;
-    extern char ostype[], osrelease[], machine[];
-    extern char hostname[], domainname[];
 
 #ifdef DEBUG
     printf("Linux-emul(%d): newuname(*)\n", p->p_pid);
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 528bb62d2aa3b..1c63681e6e12a 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -25,19 +25,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_signal.c,v 1.2 1995/06/07 21:27:57 sos Exp $
+ *  $Id: linux_signal.c,v 1.1 1995/06/25 17:32:40 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 
-#include <vm/vm.h>
-
 #include <i386/linux/linux.h>
+#include <i386/linux/sysproto.h>
 
 #define DONTMASK    (sigmask(SIGKILL)|sigmask(SIGSTOP)|sigmask(SIGCHLD))
 
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 9267063a7f7e1..b803111acb53b 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -25,17 +25,23 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.2 1995/06/07 21:27:57 sos Exp $
+ *  $Id: linux_socket.c,v 1.1 1995/06/25 17:32:41 sos Exp $
  */
 
-#include <i386/linux/linux.h>
+/* XXX we use functions that might not exist. */
+#define	COMPAT_43	1
+
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+
 #include <netinet/in.h>
 
+#include <i386/linux/linux.h>
+#include <i386/linux/sysproto.h>
 
 static int
 linux_to_bsd_domain(int domain)
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index 95839e0c97a1e..8756f095b2754 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_stats.c,v 1.1 1995/06/25 17:32:42 sos Exp $
+ *  $Id: linux_stats.c,v 1.2 1995/08/28 09:18:38 julian Exp $
  */
 
 #include <sys/param.h>
@@ -36,14 +36,12 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
+#include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 
-#include <machine/cpu.h>
-#include <machine/psl.h>
-#include <machine/reg.h>
-
 #include <i386/linux/linux.h>
+#include <i386/linux/sysproto.h>
 
 struct linux_newstat {
     unsigned short stat_dev;