release/1.1.0_cvs

3 files changed, 110 insertions, 14 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 58ad9f9aee3e..3fdbb5a24850 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $Id: files,v 1.7 1993/10/16 16:31:52 rgrimes Exp $
+# $Id: files,v 1.20 1994/01/25 11:16:01 rgrimes Exp $
 #
 ddb/db_access.c		optional ddb
 ddb/db_aout.c		optional ddb
@@ -22,12 +22,14 @@ isofs/isofs_node.c	optional isofs
 isofs/isofs_util.c	optional isofs
 isofs/isofs_vfsops.c	optional isofs
 isofs/isofs_vnops.c	optional isofs
-isofs/isofs_rrip.c      optional isofs
+isofs/isofs_rrip.c	optional isofs
 kern/dead_vnops.c	standard
 kern/fifo_vnops.c	standard
+kern/imgact_aout.c	standard
+kern/imgact_shell.c	standard
 kern/init_main.c	standard
 kern/init_sysent.c	standard
-kern/kern__physio.c	standard
+kern/kern_physio.c	standard
 kern/kern_acct.c	standard
 kern/kern_clock.c	standard
 kern/kern_descrip.c	standard
@@ -54,6 +56,11 @@ kern/subr_xxx.c		standard
 kern/sys_generic.c	standard
 kern/sys_process.c	standard
 kern/sys_socket.c	standard
+kern/sysv_ipc.c		optional sysvmsg
+kern/sysv_ipc.c		optional sysvsem
+kern/sysv_ipc.c		optional sysvshm
+kern/sysv_msg.c		optional sysvmsg
+kern/sysv_sem.c		optional sysvsem
 kern/sysv_shm.c		optional sysvshm
 kern/tty.c		standard
 kern/tty_compat.c	standard
@@ -76,7 +83,6 @@ kern/vfs_lookup.c	standard
 kern/vfs_subr.c		standard
 kern/vfs_syscalls.c	standard
 kern/vfs_vnops.c	standard
-net/af.c		standard
 net/bpf.c		optional bpfilter
 net/bpf_filter.c	optional bpfilter
 net/if.c		standard
@@ -113,11 +119,13 @@ netinet/if_ether.c	optional ether
 netinet/in.c		optional inet
 netinet/in_pcb.c	optional inet
 netinet/in_proto.c	optional inet
+netinet/in_mtudisc.c	optional mtudisc
+netinet/in_var.c	optional inet
 netinet/ip_icmp.c	optional inet
 netinet/ip_input.c	optional inet
 netinet/ip_output.c	optional inet
 netinet/raw_ip.c	optional inet
-netinet/tcp_debug.c	optional inet
+netinet/tcp_debug.c	optional tcpdebug
 netinet/tcp_input.c	optional inet
 netinet/tcp_output.c	optional inet
 netinet/tcp_subr.c	optional inet
@@ -179,6 +187,8 @@ netns/ns_pcb.c		optional ns
 netns/ns_proto.c	optional ns
 netns/spp_debug.c	optional ns
 netns/spp_usrreq.c	optional ns
+netrmp/rmp.c		optional rmp
+netrmp/rmp_proto.c	optional rmp
 nfs/nfs_bio.c		optional nfs
 nfs/nfs_node.c		optional nfs
 nfs/nfs_serv.c		optional nfs
@@ -194,12 +204,18 @@ pcfs/pcfs_fat.c		optional pcfs
 pcfs/pcfs_lookup.c	optional pcfs
 pcfs/pcfs_vfsops.c	optional pcfs
 pcfs/pcfs_vnops.c	optional pcfs
+procfs/procfs_vnops.c	standard
+procfs/procfs_vfsops.c	standard
+procfs/procfs_subr.c	standard
 scsi/cd.c		optional cd
 scsi/ch.c		optional ch
 scsi/scsiconf.c		optional scbus
+scsi/scsi_base.c	optional scbus
+scsi/scsi_ioctl.c	optional scbus
 scsi/sd.c		optional sd
-scsi/sg.c		optional sg
 scsi/st.c		optional st
+scsi/su.c		optional su
+scsi/uk.c		optional uk
 ufs/mfs_vfsops.c	optional mfs
 ufs/mfs_vnops.c		optional mfs
 ufs/ufs_alloc.c		standard
@@ -213,9 +229,9 @@ ufs/ufs_subr.c		standard
 ufs/ufs_tables.c	standard
 ufs/ufs_vfsops.c	standard
 ufs/ufs_vnops.c		standard
-vm/device_pager.c	optional devpager
+vm/device_pager.c	standard
 vm/kern_lock.c		standard
-vm/swap_pager.c		optional swappager
+vm/swap_pager.c		standard
 vm/vm_fault.c		standard
 vm/vm_glue.c		standard
 vm/vm_init.c		standard
@@ -230,4 +246,4 @@ vm/vm_pager.c		standard
 vm/vm_swap.c		standard
 vm/vm_unix.c		standard
 vm/vm_user.c		standard
-vm/vnode_pager.c	optional vnodepager
+vm/vnode_pager.c	standard
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 2927ef4c9801..ab111aa33136 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	from: @(#)newvers.sh	7.4 (Berkeley) 12/7/90
-#	$Id: newvers.sh,v 1.3.2.1 1993/11/13 20:57:58 rgrimes Exp $
+#	$Id: newvers.sh,v 1.7.2.3 1994/05/01 19:19:34 rgrimes Exp $
 #
 
 if [ ! -r version ]
@@ -44,7 +44,7 @@ fi
 
 touch version
 
-kernvers="FreeBSD 1.0.2"
+kernvers="FreeBSD 1.1(Release)"
 v=`cat version` t=`date "+ %m/%d/%y %H:%M"`
 t=`date`
 user=${USER-root}
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 9ba417e0d51c..115a3239c44e 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -1,4 +1,11 @@
 /*
+ * Copyright (c) UNIX System Laboratories, Inc.  All or some portions
+ * of this file are derived from material licensed to the
+ * University of California by American Telephone and Telegraph Co.
+ * or UNIX System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ */
+/*
  * Copyright (c) 1980, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
@@ -31,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.c	7.20 (Berkeley) 6/27/91
- *	$Id: param.c,v 1.3 1993/10/16 16:31:57 rgrimes Exp $
+ *	$Id: param.c,v 1.9.2.1 1994/05/04 07:44:02 rgrimes Exp $
  */
 
 #include "sys/param.h"
@@ -49,6 +56,12 @@
 #include "machine/vmparam.h"
 #include "sys/shm.h"
 #endif
+#ifdef SYSVSEM
+#include "sys/sem.h"
+#endif
+#ifdef SYSVMSG
+#include "sys/msg.h"
+#endif
 
 /*
  * System parameter formulae.
@@ -65,12 +78,17 @@
 #endif
 int	hz = HZ;
 int	tick = 1000000 / HZ;
+#ifndef TICKADJ
 int	tickadj = 240000 / (60 * HZ);		/* can adjust 240ms in 60s */
+#else
+int     tickadj = TICKADJ;      /* NTP users may prefer a smaller value */
+#endif
 struct	timezone tz = { TIMEZONE, DST };
 #define	NPROC (20 + 16 * MAXUSERS)
 int	maxproc = NPROC;
-#define	NTEXT (80 + NPROC / 8)			/* actually the object cache */
-#define	NVNODE (NPROC + NTEXT + 100)
+#define	NTEXT NPROC		/* actually the object cache */
+int	vm_cache_max = NTEXT / 2 + 16;
+#define	NVNODE (NPROC + NTEXT + 100 + 16)
 long	desiredvnodes = NVNODE;
 int	maxfdescs = MAXFDESCS;
 int	maxfiles = 3 * (NPROC + MAXUSERS) + 80;
@@ -99,6 +117,43 @@ struct	shminfo shminfo = {
 #endif
 
 /*
+ * Values in support of System V compatible semaphores.
+ */
+
+#ifdef SYSVSEM
+
+struct seminfo seminfo = {
+                SEMMAP,         /* # of entries in semaphore map */
+                SEMMNI,         /* # of semaphore identifiers */
+                SEMMNS,         /* # of semaphores in system */
+                SEMMNU,         /* # of undo structures in system */
+                SEMMSL,         /* max # of semaphores per id */
+                SEMOPM,         /* max # of operations per semop call */
+                SEMUME,         /* max # of undo entries per process */
+                SEMUSZ,         /* size in bytes of undo structure */
+                SEMVMX,         /* semaphore maximum value */
+                SEMAEM          /* adjust on exit max value */
+};
+#endif
+
+/*
+ * Values in support of System V compatible messages.
+ */
+
+#ifdef SYSVMSG
+
+struct msginfo msginfo = {
+                MSGMAX,         /* max chars in a message */
+                MSGMNI,         /* # of message queue identifiers */
+                MSGMNB,         /* max chars in a queue */
+                MSGTQL,         /* max messages in system */
+                MSGSSZ,         /* size of a message segment */
+                		/* (must be small power of 2 greater than 4) */
+                MSGSEG          /* number of message segments */
+};
+#endif
+
+/*
  * These are initialized at bootstrap time
  * to values dependent on memory size
  */
@@ -138,3 +193,28 @@ char	*buffers;
 struct	proc *pidhash[PIDHSZ];
 struct	pgrp *pgrphash[PIDHSZ];
 int	pidhashmask = PIDHSZ - 1;
+
+/* From kernel.h: */
+long hostid;
+char hostname[MAXHOSTNAMELEN];
+int hostnamelen;
+char domainname[MAXHOSTNAMELEN];
+int domainnamelen;
+
+struct timeval boottime;
+struct timeval time;
+
+int phz;
+int lbolt;
+
+fixpt_t avenrunnable[3];
+#if defined(COMPAT_43) && (defined(vax) || defined(tahoe))
+double	avenrun[3];
+#endif /* COMPAT_43 */
+
+#ifdef GPROF
+u_long s_textsize;
+int profiling;
+u_short *kcount;
+char *s_lowpc;
+#endif