svn commit: r227267 - in head/sys: dev/iscsi/initiator fs/nwfs fs/smbfs sys ufs/ufs

[Ed Schouten]

Author: ed
Date: Sun Nov  6 20:16:50 2011
New Revision: 227267
URL: http://svn.freebsd.org/changeset/base/227267

Log:
  Remove MALLOC_DECLAREs of nonexisting malloc-pools.
  
  After careful grepping, it seems none of these pools can be found in our
  source tree. They are not in use, nor are they defined.

Modified:
  head/sys/dev/iscsi/initiator/iscsivar.h
  head/sys/fs/nwfs/nwfs_mount.h
  head/sys/fs/smbfs/smbfs.h
  head/sys/sys/event.h
  head/sys/sys/file.h
  head/sys/ufs/ufs/extattr.h

Modified: head/sys/dev/iscsi/initiator/iscsivar.h
==============================================================================
--- head/sys/dev/iscsi/initiator/iscsivar.h	Sun Nov  6 20:09:22 2011	(r227266)
+++ head/sys/dev/iscsi/initiator/iscsivar.h	Sun Nov  6 20:16:50 2011	(r227267)
@@ -64,7 +64,6 @@ typedef uint32_t digest_t(const void *, 
 
 MALLOC_DECLARE(M_ISCSI);
 MALLOC_DECLARE(M_ISCSIBUF);
-MALLOC_DECLARE(M_PDU);
 
 #define ISOK2DIG(dig, pp)	((dig != NULL) && ((pp->ipdu.bhs.opcode & 0x1f) != ISCSI_LOGIN_CMD))
 

Modified: head/sys/fs/nwfs/nwfs_mount.h
==============================================================================
--- head/sys/fs/nwfs/nwfs_mount.h	Sun Nov  6 20:09:22 2011	(r227266)
+++ head/sys/fs/nwfs/nwfs_mount.h	Sun Nov  6 20:16:50 2011	(r227267)
@@ -65,11 +65,4 @@ struct nwfs_args {
 	int		tz;
 };
 
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NWFSMNT);
-#endif
-
-#endif
 #endif /* !_NWFS_MOUNT_H_ */

Modified: head/sys/fs/smbfs/smbfs.h
==============================================================================
--- head/sys/fs/smbfs/smbfs.h	Sun Nov  6 20:09:22 2011	(r227266)
+++ head/sys/fs/smbfs/smbfs.h	Sun Nov  6 20:16:50 2011	(r227267)
@@ -61,10 +61,6 @@ struct smbfs_args {
 
 #include <sys/_sx.h>
 
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_SMBFSMNT);
-#endif
-
 struct smbnode;
 struct smb_share;
 struct u_cred;

Modified: head/sys/sys/event.h
==============================================================================
--- head/sys/sys/event.h	Sun Nov  6 20:09:22 2011	(r227266)
+++ head/sys/sys/event.h	Sun Nov  6 20:16:50 2011	(r227267)
@@ -147,10 +147,6 @@ struct knlist {
 
 #ifdef _KERNEL
 
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_KQUEUE);
-#endif
-
 /*
  * Flags for knote call
  */

Modified: head/sys/sys/file.h
==============================================================================
--- head/sys/sys/file.h	Sun Nov  6 20:09:22 2011	(r227266)
+++ head/sys/sys/file.h	Sun Nov  6 20:16:50 2011	(r227267)
@@ -185,10 +185,6 @@ struct xfile {
 
 #ifdef _KERNEL
 
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_FILE);
-#endif
-
 extern struct fileops vnops;
 extern struct fileops badfileops;
 extern struct fileops socketops;

Modified: head/sys/ufs/ufs/extattr.h
==============================================================================
--- head/sys/ufs/ufs/extattr.h	Sun Nov  6 20:09:22 2011	(r227266)
+++ head/sys/ufs/ufs/extattr.h	Sun Nov  6 20:16:50 2011	(r227267)
@@ -115,10 +115,6 @@ struct extattr {
 
 #include <sys/_sx.h>
 
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_EXTATTR);
-#endif
-
 struct vnode;
 LIST_HEAD(ufs_extattr_list_head, ufs_extattr_list_entry);
 struct ufs_extattr_list_entry {