diff options
-rw-r--r-- | sys/conf/param.c | 4 | ||||
-rw-r--r-- | sys/kern/init_main.c | 36 | ||||
-rw-r--r-- | sys/kern/subr_param.c | 4 | ||||
-rw-r--r-- | sys/netiso/iso_var.h | 7 | ||||
-rw-r--r-- | sys/sys/conf.h | 3 | ||||
-rw-r--r-- | sys/sys/linedisc.h | 3 |
6 files changed, 26 insertions, 31 deletions
diff --git a/sys/conf/param.c b/sys/conf/param.c index 0a03cd6..605065d 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.c 8.2 (Berkeley) 1/21/94 - * $Id: param.c,v 1.11 1995/06/29 08:21:32 davidg Exp $ + * $Id: param.c,v 1.12 1995/07/29 11:38:39 bde Exp $ */ #include <sys/param.h> @@ -178,9 +178,7 @@ int nswbuf = 0; * them here forces loader errors if this file is omitted * (if they've been externed everywhere else; hah!). */ -struct cblock *cfree; struct buf *swbuf; -char *buffers; /* * Proc/pgrp hashing. diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a2348d2..24a68c4 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $Id: init_main.c,v 1.34 1995/12/04 16:48:18 phk Exp $ + * $Id: init_main.c,v 1.35 1995/12/07 12:46:36 davidg Exp $ */ #include <sys/param.h> @@ -88,17 +88,17 @@ extern void __main __P((void)); extern void main __P((void *framep)); /* Components of the first process -- never freed. */ -struct session session0; -struct pgrp pgrp0; +static struct session session0; +static struct pgrp pgrp0; struct proc proc0; -struct pcred cred0; -struct filedesc0 filedesc0; -struct plimit limit0; -struct vmspace vmspace0; +static struct pcred cred0; +static struct filedesc0 filedesc0; +static struct plimit limit0; +static struct vmspace vmspace0; struct proc *curproc = &proc0; struct proc *initproc; -int cmask = CMASK; +static int cmask = CMASK; extern struct user *proc0paddr; struct vnode *rootvp; @@ -307,8 +307,8 @@ SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, copyright) *************************************************************************** */ /* ARGSUSED*/ -void proc0_init __P((void *dummy)); -void +static void proc0_init __P((void *dummy)); +static void proc0_init(dummy) void *dummy; { @@ -410,8 +410,8 @@ proc0_init(dummy) SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL) /* ARGSUSED*/ -void proc0_post __P((void *dummy)); -void +static void proc0_post __P((void *dummy)); +static void proc0_post(dummy) void *dummy; { @@ -440,8 +440,8 @@ SYSINIT(p0post, SI_SUB_INTRINSIC_POST, SI_ORDER_FIRST, proc0_post, NULL) *************************************************************************** */ /* ARGSUSED*/ -void sched_setup __P((void *dummy)); -void +static void sched_setup __P((void *dummy)); +static void sched_setup(dummy) void *dummy; { @@ -452,8 +452,8 @@ sched_setup(dummy) SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL) /* ARGSUSED*/ -void xxx_vfs_mountroot __P((void *dummy)); -void +static void xxx_vfs_mountroot __P((void *dummy)); +static void xxx_vfs_mountroot(dummy) void *dummy; { @@ -464,8 +464,8 @@ xxx_vfs_mountroot(dummy) SYSINIT(mountroot, SI_SUB_ROOT, SI_ORDER_FIRST, xxx_vfs_mountroot, NULL) /* ARGSUSED*/ -void xxx_vfs_root_fdtab __P((void *dummy)); -void +static void xxx_vfs_root_fdtab __P((void *dummy)); +static void xxx_vfs_root_fdtab(dummy) void *dummy; { diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index 0a03cd6..605065d 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.c 8.2 (Berkeley) 1/21/94 - * $Id: param.c,v 1.11 1995/06/29 08:21:32 davidg Exp $ + * $Id: param.c,v 1.12 1995/07/29 11:38:39 bde Exp $ */ #include <sys/param.h> @@ -178,9 +178,7 @@ int nswbuf = 0; * them here forces loader errors if this file is omitted * (if they've been externed everywhere else; hah!). */ -struct cblock *cfree; struct buf *swbuf; -char *buffers; /* * Proc/pgrp hashing. diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h index 537cb90..3bfd643 100644 --- a/sys/netiso/iso_var.h +++ b/sys/netiso/iso_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_var.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp $ + * $Id: iso_var.h,v 1.6 1995/11/21 12:54:20 bde Exp $ */ #ifndef _NETISO_ISO_VAR_H_ @@ -63,7 +63,7 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp $ +/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.6 1995/11/21 12:54:20 bde Exp $ * $Source: /home/ncvs/src/sys/netiso/iso_var.h,v $ */ @@ -135,7 +135,8 @@ struct snpa_hdr { short snh_flags; }; #ifdef KERNEL -struct iso_ifaddr *iso_ifaddr; /* linked list of iso address ifaces */ +extern struct iso_ifaddr *iso_ifaddr; + /* linked list of iso address ifaces */ struct iso_ifaddr *iso_localifa __P((struct sockaddr_iso *siso)); /* linked list of iso address ifaces */ void clnlintr __P((void)); diff --git a/sys/sys/conf.h b/sys/sys/conf.h index d29f7e0..0c41f31 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.3 (Berkeley) 1/21/94 - * $Id: conf.h,v 1.24 1995/12/05 19:53:14 bde Exp $ + * $Id: conf.h,v 1.25 1995/12/08 11:19:24 julian Exp $ */ #ifndef _SYS_CONF_H_ @@ -211,7 +211,6 @@ int iskmemdev __P((dev_t dev)); int iszerodev __P((dev_t dev)); int register_cdev __P((const char *name, const struct cdevsw *cdp)); void setconf __P((void)); -int setdumpdev __P((dev_t)); int unregister_cdev __P((const char *name, const struct cdevsw *cdp)); #endif /* KERNEL */ diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index d29f7e0..0c41f31 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.3 (Berkeley) 1/21/94 - * $Id: conf.h,v 1.24 1995/12/05 19:53:14 bde Exp $ + * $Id: conf.h,v 1.25 1995/12/08 11:19:24 julian Exp $ */ #ifndef _SYS_CONF_H_ @@ -211,7 +211,6 @@ int iskmemdev __P((dev_t dev)); int iszerodev __P((dev_t dev)); int register_cdev __P((const char *name, const struct cdevsw *cdp)); void setconf __P((void)); -int setdumpdev __P((dev_t)); int unregister_cdev __P((const char *name, const struct cdevsw *cdp)); #endif /* KERNEL */ |