diff options
author | Markus Friedl <markus@cvs.openbsd.org> | 2004-01-07 21:31:00 +0000 |
---|---|---|
committer | Markus Friedl <markus@cvs.openbsd.org> | 2004-01-07 21:31:00 +0000 |
commit | be2b81b9d8787d66960c0458337ed577764633b4 (patch) | |
tree | ae5bee225dd348c816e53ab2de61203cd821fa13 | |
parent | c0c29b7796b53657559c366a2a3296e64497871d (diff) |
no kern_watchdog for SMALL_KERNEL; ok deraadt@
-rw-r--r-- | sys/conf/files | 4 | ||||
-rw-r--r-- | sys/kern/kern_sysctl.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files index e36a80e6703..c2d9380e7b9 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.287 2004/01/07 00:13:22 fgsch Exp $ +# $OpenBSD: files,v 1.288 2004/01/07 21:30:59 markus Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -544,7 +544,7 @@ file kern/kern_sysctl.c file kern/kern_synch.c file kern/kern_time.c file kern/kern_timeout.c -file kern/kern_watchdog.c +file kern/kern_watchdog.c !small_kernel file kern/kern_xxx.c file kern/kgdb_stub.c kgdb file kern/subr_autoconf.c diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 85cba92358e..e39f26dbe67 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.96 2004/01/07 19:34:03 millert Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.97 2004/01/07 21:30:59 markus Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -487,9 +487,11 @@ kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) #endif case KERN_INTRCNT: return (sysctl_intrcnt(name + 1, namelen - 1, oldp, oldlenp)); +#ifndef SMALL_KERNEL case KERN_WATCHDOG: return (sysctl_wdog(name + 1, namelen - 1, oldp, oldlenp, newp, newlen)); +#endif case KERN_EMUL: return (sysctl_emul(name + 1, namelen - 1, oldp, oldlenp, newp, newlen)); |