diff options
| author | bde <bde@FreeBSD.org> | 1997-11-23 10:43:49 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-11-23 10:43:49 +0000 |
| commit | 6c224bdd6e4fe8f6e79f250fa8e78e3f70ec5ed5 (patch) | |
| tree | df8f338065359d4914a5238a7c829792520e2f31 | |
| parent | 4f5d10af436daeb26aea767db600c1e1bfad33e9 (diff) | |
| download | FreeBSD-src-6c224bdd6e4fe8f6e79f250fa8e78e3f70ec5ed5.zip FreeBSD-src-6c224bdd6e4fe8f6e79f250fa8e78e3f70ec5ed5.tar.gz | |
Fixed duplicate definitions of M_FILE (one static).
| -rw-r--r-- | sys/kern/kern_descrip.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 6 | ||||
| -rw-r--r-- | sys/sys/file.h | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 7cdebfb..dd59915 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.42 1997/10/12 20:23:45 phk Exp $ + * $Id: kern_descrip.c,v 1.43 1997/11/06 19:29:07 phk Exp $ */ #include <sys/param.h> @@ -67,7 +67,7 @@ #endif /*DEVFS*/ static MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table"); -static MALLOC_DEFINE(M_FILE, "file", "Open file structure"); +MALLOC_DEFINE(M_FILE, "file", "Open file structure"); static d_open_t fdopen; diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index dafb5d9..3787119 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.28 1997/10/12 20:24:18 phk Exp $ + * $Id: uipc_usrreq.c,v 1.29 1997/11/07 08:53:02 phk Exp $ */ #include <sys/param.h> @@ -39,9 +39,9 @@ #include <sys/kernel.h> #include <sys/domain.h> #include <sys/fcntl.h> +#include <sys/malloc.h> /* XXX must be before <sys/file.h> */ #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/namei.h> #include <sys/proc.h> @@ -53,8 +53,6 @@ #include <sys/un.h> #include <sys/vnode.h> -MALLOC_DEFINE(M_FILE, "file", "Open file structure"); - /* * Unix communications domain. * diff --git a/sys/sys/file.h b/sys/sys/file.h index 209c39b..612dbf5 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)file.h 8.3 (Berkeley) 1/9/95 - * $Id: file.h,v 1.13 1997/03/23 03:37:29 bde Exp $ + * $Id: file.h,v 1.14 1997/09/14 02:25:40 peter Exp $ */ #ifndef _SYS_FILE_H_ @@ -85,6 +85,10 @@ struct file { caddr_t f_data; /* vnode or socket */ }; +#ifdef MALLOC_DECLARE +MALLOC_DECLARE(M_FILE); +#endif + LIST_HEAD(filelist, file); extern struct filelist filehead; /* head of list of open files */ extern struct fileops vnops; |
