diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-12-10 22:07:20 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-12-10 22:07:20 +0000 |
commit | 3a88d25150da1f7bdf84c59150dcb729bae0bd44 (patch) | |
tree | 81aa41b7f85786dd7e16668d33d4acf0f055e81e /usr.sbin | |
parent | c50e34135404d478835775470542912711005a2e (diff) |
Now that the old SysV SHM size limits global variables are gone, remove
support for setting them from config(8).
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/config/cmd.c | 18 | ||||
-rw-r--r-- | usr.sbin/config/config.8 | 10 | ||||
-rw-r--r-- | usr.sbin/config/ukc.c | 4 | ||||
-rw-r--r-- | usr.sbin/config/ukc.h | 10 |
4 files changed, 6 insertions, 36 deletions
diff --git a/usr.sbin/config/cmd.c b/usr.sbin/config/cmd.c index 3afe52373ae..843731159e5 100644 --- a/usr.sbin/config/cmd.c +++ b/usr.sbin/config/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.17 2009/10/27 23:59:51 deraadt Exp $ */ +/* $OpenBSD: cmd.c,v 1.18 2009/12/10 22:07:19 kettenis Exp $ */ /* * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. @@ -59,8 +59,6 @@ cmd_table_t cmd_table[] = { {"bufcachepercent", Xbufcachepct, "[number]", "Show/change BUFCACHEPERCENT"}, {"nkmempg", Xnkmempg, "[number]", "Show/change NKMEMPAGES"}, - {"shmseg", Xshmseg, "[number]", "Show/change SHMSEG"}, - {"shmmaxpgs", Xshmmaxpgs,"[number]", "Show/change SHMMAXPGS"}, {NULL, NULL, NULL, NULL} }; @@ -315,17 +313,3 @@ Xnkmempg(cmd_t *cmd) int_variable_adjust(cmd, I_NKMEMPG, "nkmempages"); return (CMD_CONT); } - -int -Xshmseg(cmd_t *cmd) -{ - int_variable_adjust(cmd, I_SHMSEG, "shmseg"); - return (CMD_CONT); -} - -int -Xshmmaxpgs(cmd_t *cmd) -{ - int_variable_adjust(cmd, I_SHMMAXPGS, "shmmaxpgs"); - return (CMD_CONT); -} diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8 index 6e60e7e918f..f2e7e926a10 100644 --- a/usr.sbin/config/config.8 +++ b/usr.sbin/config/config.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: config.8,v 1.53 2009/06/03 21:42:16 beck Exp $ +.\" $OpenBSD: config.8,v 1.54 2009/12/10 22:07:19 kettenis Exp $ .\" $NetBSD: config.8,v 1.10 1996/08/31 20:58:16 mycroft Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" from: @(#)config.8 8.2 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: June 3 2009 $ +.Dd $Mdocdate: December 10 2009 $ .Dt CONFIG 8 .Os .Sh NAME @@ -322,12 +322,6 @@ Change the NKMEMPAGES value. Without arguments, displays its current value. .It Ic quit Exit and save changes. -.It Ic shmmaxpgs Op Ar number -Change the SHMMAXPGS value. -Without arguments, displays its current value. -.It Ic shmseg Op Ar number -Change the SHMSEG value. -Without arguments, displays its current value. .It Ic show Op Ar attr Op Ar val Show all devices for which attribute .Ar attr diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c index 27d6e3bf506..05a367c405e 100644 --- a/usr.sbin/config/ukc.c +++ b/usr.sbin/config/ukc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukc.c,v 1.15 2009/10/27 23:59:51 deraadt Exp $ */ +/* $OpenBSD: ukc.c,v 1.16 2009/12/10 22:07:19 kettenis Exp $ */ /* * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. @@ -138,8 +138,6 @@ WARNING this kernel doesn't support pseudo devices.\n"); check_int(I_BUFCACHEPCT, "BUFCACHEPERCENT"); check_int(I_NKMEMPG, "NKMEMPAGES"); - check_int(I_SHMSEG, "SHMSEG"); - check_int(I_SHMMAXPGS, "SHMMAXPGS"); init(); diff --git a/usr.sbin/config/ukc.h b/usr.sbin/config/ukc.h index b47897475cb..283822a278c 100644 --- a/usr.sbin/config/ukc.h +++ b/usr.sbin/config/ukc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ukc.h,v 1.11 2003/06/25 21:10:12 deraadt Exp $ */ +/* $OpenBSD: ukc.h,v 1.12 2009/12/10 22:07:19 kettenis Exp $ */ /* * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. @@ -48,9 +48,7 @@ #define I_NMBCLUSTERS 18 #define I_BUFCACHEPCT 19 #define I_NKMEMPG 20 -#define I_SHMSEG 21 -#define I_SHMMAXPGS 22 -#define NLENTRIES 23 +#define NLENTRIES 21 #ifdef UKC_MAIN struct nlist nl[] = { @@ -75,8 +73,6 @@ struct nlist nl[] = { { "_nmbclust" }, { "_bufcachepercent" }, { "_nkmempages" }, - { "_shmseg" }, - { "_shmmaxpgs" }, { NULL }, }; struct nlist knl[] = { @@ -101,8 +97,6 @@ struct nlist knl[] = { { "_nmbclust" }, { "_bufcachepercent" }, { "_nkmempages" }, - { "_shmseg" }, - { "_shmmaxpgs" }, { NULL }, }; int maxdev = 0; |