diff options
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/init_main.c | 5 | ||||
-rw-r--r-- | sys/kern/init_sysent.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_clock.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_exit.c | 5 | ||||
-rw-r--r-- | sys/kern/kern_sig.c | 5 | ||||
-rw-r--r-- | sys/kern/kern_synch.c | 5 | ||||
-rw-r--r-- | sys/kern/kern_xxx.c | 5 | ||||
-rw-r--r-- | sys/kern/subr_prf.c | 5 | ||||
-rw-r--r-- | sys/kern/subr_prof.c | 5 | ||||
-rw-r--r-- | sys/kern/syscalls.c | 2 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 7 | ||||
-rw-r--r-- | sys/kern/vfs_cluster.c | 8 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 3 |
13 files changed, 27 insertions, 35 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 3ab7d0d4008..84e6cc50864 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,5 +1,5 @@ -/* $OpenBSD: init_main.c,v 1.5 1996/04/21 22:26:50 deraadt Exp $ */ -/* $NetBSD: init_main.c,v 1.83 1996/04/04 00:26:28 cgd Exp $ */ +/* $OpenBSD: init_main.c,v 1.6 1996/05/02 13:12:05 deraadt Exp $ */ +/* $NetBSD: init_main.c,v 1.84 1996/04/22 01:38:12 christos Exp $ */ /* * Copyright (c) 1995 Christopher G. Demetriou. All rights reserved. @@ -63,7 +63,6 @@ #include <sys/protosw.h> #include <sys/reboot.h> #include <sys/user.h> -#include <sys/cpu.h> #ifdef SYSVSHM #include <sys/shm.h> #endif diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 714e6326e6e..04c53519fb4 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -497,8 +497,8 @@ struct sysent sysent[] = { sys_munlock }, /* 204 = munlock */ { 1, s(struct sys_undelete_args), sys_undelete }, /* 205 = undelete */ - { 0, 0, - sys_nosys }, /* 206 = unimplemented */ + { 2, s(struct sys_futimes_args), + sys_futimes }, /* 206 = futimes */ { 0, 0, sys_nosys }, /* 207 = unimplemented */ { 0, 0, diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 6f66d4d65ba..079a975c5e7 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clock.c,v 1.9 1996/04/21 22:26:53 deraadt Exp $ */ +/* $OpenBSD: kern_clock.c,v 1.10 1996/05/02 13:12:09 deraadt Exp $ */ /* $NetBSD: kern_clock.c,v 1.31 1996/03/15 07:56:00 mycroft Exp $ */ /*- @@ -49,7 +49,6 @@ #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> -#include <sys/cpu.h> #include <vm/vm.h> #include <sys/sysctl.h> #include <sys/timex.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 3c6a54e5d9f..aa3177dbe6f 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,5 +1,5 @@ -/* $OpenBSD: kern_exit.c,v 1.5 1996/03/03 17:19:44 niklas Exp $ */ -/* $NetBSD: kern_exit.c,v 1.38 1996/02/09 18:59:29 christos Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.6 1996/05/02 13:12:11 deraadt Exp $ */ +/* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1991, 1993 @@ -68,7 +68,6 @@ #ifdef SYSVSEM #include <sys/sem.h> #endif -#include <sys/cpu.h> #include <sys/mount.h> #include <sys/syscallargs.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 17ecd41a5da..387bea938d8 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,5 +1,5 @@ -/* $OpenBSD: kern_sig.c,v 1.3 1996/03/03 17:19:54 niklas Exp $ */ -/* $NetBSD: kern_sig.c,v 1.53 1996/02/09 18:59:47 christos Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.4 1996/05/02 13:12:13 deraadt Exp $ */ +/* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1991, 1993 @@ -61,7 +61,6 @@ #include <sys/stat.h> #include <sys/core.h> #include <sys/ptrace.h> -#include <sys/cpu.h> #include <sys/mount.h> #include <sys/syscallargs.h> diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 2204e775f6d..071156d5f7e 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,5 +1,5 @@ -/* $OpenBSD: kern_synch.c,v 1.3 1996/04/21 22:27:08 deraadt Exp $ */ -/* $NetBSD: kern_synch.c,v 1.36 1996/03/30 22:23:25 christos Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.4 1996/05/02 13:12:15 deraadt Exp $ */ +/* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1990, 1991, 1993 @@ -52,7 +52,6 @@ #ifdef KTRACE #include <sys/ktrace.h> #endif -#include <sys/cpu.h> #include <machine/cpu.h> diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 7bfb70d5a06..2c1bec60664 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -1,5 +1,5 @@ -/* $OpenBSD: kern_xxx.c,v 1.2 1996/03/03 17:19:58 niklas Exp $ */ -/* $NetBSD: kern_xxx.c,v 1.31 1996/02/09 18:59:54 christos Exp $ */ +/* $OpenBSD: kern_xxx.c,v 1.3 1996/05/02 13:12:17 deraadt Exp $ */ +/* $NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -43,7 +43,6 @@ #include <sys/reboot.h> #include <vm/vm.h> #include <sys/sysctl.h> -#include <sys/cpu.h> #include <sys/mount.h> #include <sys/syscallargs.h> diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 4e5a6b0a5c8..89d0c6c585b 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: subr_prf.c,v 1.4 1996/04/21 22:27:19 deraadt Exp $ */ -/* $NetBSD: subr_prf.c,v 1.24 1996/03/30 22:25:18 christos Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.5 1996/05/02 13:12:20 deraadt Exp $ */ +/* $NetBSD: subr_prf.c,v 1.25 1996/04/22 01:38:46 christos Exp $ */ /*- * Copyright (c) 1986, 1988, 1991, 1993 @@ -55,7 +55,6 @@ #include <sys/tprintf.h> #include <sys/syslog.h> #include <sys/malloc.h> -#include <sys/cpu.h> #include <dev/cons.h> diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 0f68cb036cd..d81c04b8ea9 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -1,5 +1,5 @@ -/* $OpenBSD: subr_prof.c,v 1.5 1996/04/28 00:26:46 tholo Exp $ */ -/* $NetBSD: subr_prof.c,v 1.11 1996/03/17 02:44:40 pk Exp $ */ +/* $OpenBSD: subr_prof.c,v 1.6 1996/05/02 13:12:22 deraadt Exp $ */ +/* $NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -41,7 +41,6 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/user.h> -#include <sys/cpu.h> #include <sys/mount.h> #include <sys/syscallargs.h> diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 10393c40669..27d064051ed 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -252,7 +252,7 @@ char *syscallnames[] = { "mlock", /* 203 = mlock */ "munlock", /* 204 = munlock */ "undelete", /* 205 = undelete */ - "#206 (unimplemented)", /* 206 = unimplemented */ + "futimes", /* 206 = futimes */ "#207 (unimplemented)", /* 207 = unimplemented */ "#208 (unimplemented)", /* 208 = unimplemented */ "#209 (unimplemented)", /* 209 = unimplemented */ diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 7dc9f72e440..698f645ead3 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,5 +1,5 @@ -/* $OpenBSD: vfs_bio.c,v 1.4 1996/04/19 16:09:09 niklas Exp $ */ -/* $NetBSD: vfs_bio.c,v 1.42 1996/02/18 11:57:08 fvdl Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.5 1996/05/02 13:12:29 deraadt Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.43 1996/04/22 01:38:59 christos Exp $ */ /*- * Copyright (c) 1994 Christopher G. Demetriou @@ -59,7 +59,8 @@ #include <sys/malloc.h> #include <sys/resourcevar.h> #include <sys/conf.h> -#include <sys/cpu.h> + +#include <vm/vm.h> #include "rnd.h" #if NRND > 0 diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 498b72b0b1a..e0f8be723b1 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -1,5 +1,5 @@ -/* $OpenBSD: vfs_cluster.c,v 1.3 1996/04/21 22:27:34 deraadt Exp $ */ -/* $NetBSD: vfs_cluster.c,v 1.11 1996/03/16 23:17:18 christos Exp $ */ +/* $OpenBSD: vfs_cluster.c,v 1.4 1996/05/02 13:12:33 deraadt Exp $ */ +/* $NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $ */ /*- * Copyright (c) 1993 @@ -45,10 +45,10 @@ #include <sys/malloc.h> #include <sys/systm.h> #include <sys/resourcevar.h> -#include <sys/cpu.h> -#ifdef DEBUG #include <vm/vm.h> + +#ifdef DEBUG #include <sys/sysctl.h> int doreallocblks = 0; struct ctldebug debug13 = { "doreallocblks", &doreallocblks }; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index eba355f8e7f..4cbf0a43afa 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_subr.c,v 1.52 1996/03/16 23:17:20 christos Exp $ */ +/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -60,7 +60,6 @@ #include <sys/domain.h> #include <sys/mbuf.h> #include <sys/syscallargs.h> -#include <sys/cpu.h> #include <vm/vm.h> #include <sys/sysctl.h> |