Module Name: src Committed By: uebayasi Date: Sat Aug 29 07:08:38 UTC 2015
Modified Files: src/sys/conf: Makefile.kern.inc files src/sys/sys: param.h src/usr.bin/config: defs.h mkmakefile.c sem.c Log Message: Define MAXUXERS in opt_param.h. Bump config(1) version. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/sys/conf/Makefile.kern.inc cvs rdiff -u -r1.1136 -r1.1137 src/sys/conf/files cvs rdiff -u -r1.483 -r1.484 src/sys/sys/param.h cvs rdiff -u -r1.67 -r1.68 src/usr.bin/config/defs.h cvs rdiff -u -r1.42 -r1.43 src/usr.bin/config/mkmakefile.c cvs rdiff -u -r1.71 -r1.72 src/usr.bin/config/sem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/conf/Makefile.kern.inc diff -u src/sys/conf/Makefile.kern.inc:1.200 src/sys/conf/Makefile.kern.inc:1.201 --- src/sys/conf/Makefile.kern.inc:1.200 Sat Aug 29 05:03:36 2015 +++ src/sys/conf/Makefile.kern.inc Sat Aug 29 07:08:38 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.kern.inc,v 1.200 2015/08/29 05:03:36 uebayasi Exp $ +# $NetBSD: Makefile.kern.inc,v 1.201 2015/08/29 07:08:38 uebayasi Exp $ # # This file contains common `MI' targets and definitions and it is included # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. @@ -62,7 +62,7 @@ S!= cd ../../../..; pwd ## INCLUDES?= -I. ${EXTRA_INCLUDES} -I${S}/../common/include -I$S/arch \ -I$S -nostdinc -CPPFLAGS+= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT +CPPFLAGS+= ${INCLUDES} ${IDENT} -D_KERNEL -D_KERNEL_OPT CPPFLAGS+= -std=gnu99 DEFCOPTS?= -O2 COPTS?= ${DEFCOPTS} Index: src/sys/conf/files diff -u src/sys/conf/files:1.1136 src/sys/conf/files:1.1137 --- src/sys/conf/files:1.1136 Fri Aug 21 07:19:39 2015 +++ src/sys/conf/files Sat Aug 29 07:08:38 2015 @@ -1,7 +1,7 @@ -# $NetBSD: files,v 1.1136 2015/08/21 07:19:39 uebayasi Exp $ +# $NetBSD: files,v 1.1137 2015/08/29 07:08:38 uebayasi Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 -version 20150820 +version 20150829 # # device classes @@ -17,6 +17,7 @@ devclass bus # options understood by the machine-independent part of the kernel # (note, these are case-sensitive) # +defparam opt_param.h MAXUSERS defflag INSECURE defflag KMEMSTATS defflag KTRACE Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.483 src/sys/sys/param.h:1.484 --- src/sys/sys/param.h:1.483 Sun Aug 16 18:00:03 2015 +++ src/sys/sys/param.h Sat Aug 29 07:08:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.483 2015/08/16 18:00:03 mlelstv Exp $ */ +/* $NetBSD: param.h,v 1.484 2015/08/29 07:08:38 uebayasi Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -39,6 +39,10 @@ #ifndef _SYS_PARAM_H_ #define _SYS_PARAM_H_ +#ifdef _KERNEL_OPT +#include "opt_param.h" +#endif + /* * Historic BSD #defines -- probably will remain untouched for all time. */ Index: src/usr.bin/config/defs.h diff -u src/usr.bin/config/defs.h:1.67 src/usr.bin/config/defs.h:1.68 --- src/usr.bin/config/defs.h:1.67 Sat Aug 29 02:54:07 2015 +++ src/usr.bin/config/defs.h Sat Aug 29 07:08:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.67 2015/08/29 02:54:07 uebayasi Exp $ */ +/* $NetBSD: defs.h,v 1.68 2015/08/29 07:08:38 uebayasi Exp $ */ /* * Copyright (c) 1992, 1993 @@ -107,7 +107,7 @@ extern const char *progname; * The next two lines define the current version of the config(1) binary, * and the minimum version of the configuration files it supports. */ -#define CONFIG_VERSION 20150820 +#define CONFIG_VERSION 20150829 #define CONFIG_MINVERSION 0 /* Index: src/usr.bin/config/mkmakefile.c diff -u src/usr.bin/config/mkmakefile.c:1.42 src/usr.bin/config/mkmakefile.c:1.43 --- src/usr.bin/config/mkmakefile.c:1.42 Sat Aug 29 02:54:07 2015 +++ src/usr.bin/config/mkmakefile.c Sat Aug 29 07:08:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mkmakefile.c,v 1.42 2015/08/29 02:54:07 uebayasi Exp $ */ +/* $NetBSD: mkmakefile.c,v 1.43 2015/08/29 07:08:38 uebayasi Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: mkmakefile.c,v 1.42 2015/08/29 02:54:07 uebayasi Exp $"); +__RCSID("$NetBSD: mkmakefile.c,v 1.43 2015/08/29 07:08:38 uebayasi Exp $"); #include <sys/param.h> #include <ctype.h> @@ -276,7 +276,6 @@ emitdefs(FILE *fp) s ? "\"" : ""); } putc('\n', fp); - fprintf(fp, "PARAM=-DMAXUSERS=%d\n", maxusers); fprintf(fp, "MACHINE=%s\n", machine); const char *subdir = ""; Index: src/usr.bin/config/sem.c diff -u src/usr.bin/config/sem.c:1.71 src/usr.bin/config/sem.c:1.72 --- src/usr.bin/config/sem.c:1.71 Fri Nov 21 20:46:56 2014 +++ src/usr.bin/config/sem.c Sat Aug 29 07:08:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sem.c,v 1.71 2014/11/21 20:46:56 christos Exp $ */ +/* $NetBSD: sem.c,v 1.72 2015/08/29 07:08:38 uebayasi Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: sem.c,v 1.71 2014/11/21 20:46:56 christos Exp $"); +__RCSID("$NetBSD: sem.c,v 1.72 2015/08/29 07:08:38 uebayasi Exp $"); #include <sys/param.h> #include <ctype.h> @@ -239,6 +239,7 @@ setdefmaxusers(int min, int def, int max void setmaxusers(int n) { + char buf[32]; if (maxusers == n) { cfgerror("duplicate maxusers parameter"); @@ -256,6 +257,8 @@ setmaxusers(int n) cfgerror("warning: maxusers (%d) > %d", n, maxmaxusers); errors--; } + snprintf(buf, sizeof(buf), "%d", maxusers); + addoption("MAXUSERS", buf); } void