[Midnightbsd-cvs] src [9033] trunk/sys: mark malloc defines static that have no malloc declares.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 1 05:52:13 EDT 2016
Revision: 9033
http://svnweb.midnightbsd.org/src/?rev=9033
Author: laffer1
Date: 2016-10-01 05:52:13 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
mark malloc defines static that have no malloc declares.
Modified Paths:
--------------
trunk/sys/cam/ata/ata_da.c
trunk/sys/cam/ata/ata_pmp.c
trunk/sys/cam/cam_periph.c
trunk/sys/cam/cam_queue.c
trunk/sys/cam/cam_sim.c
trunk/sys/cam/scsi/scsi_cd.c
trunk/sys/cam/scsi/scsi_ch.c
trunk/sys/cam/scsi/scsi_da.c
trunk/sys/cam/scsi/scsi_low.c
trunk/sys/cam/scsi/scsi_sa.c
trunk/sys/cam/scsi/scsi_targ_bh.c
trunk/sys/cddl/dev/cyclic/cyclic.c
trunk/sys/cddl/dev/fbt/fbt.c
trunk/sys/dev/aac/aac.c
trunk/sys/dev/aac/aac_cam.c
trunk/sys/dev/acpi_support/acpi_wmi.c
trunk/sys/dev/amr/amr.c
trunk/sys/dev/amr/amr_cam.c
trunk/sys/dev/ciss/ciss.c
trunk/sys/dev/drm2/drm_global.h
trunk/sys/dev/firewire/fwmem.c
trunk/sys/dev/firewire/if_fwe.c
trunk/sys/dev/firewire/if_fwip.c
trunk/sys/dev/firewire/sbp.c
trunk/sys/dev/firewire/sbp_targ.c
trunk/sys/dev/iicbus/ad7417.c
trunk/sys/dev/iicbus/max6690.c
trunk/sys/dev/iir/iir.c
trunk/sys/dev/ipmi/ipmi.c
trunk/sys/dev/iscsi/initiator/isc_subr.c
trunk/sys/dev/iscsi/initiator/iscsi.c
trunk/sys/dev/malo/if_malo.c
trunk/sys/dev/mvs/mvs.c
trunk/sys/dev/mwl/if_mwl.c
trunk/sys/dev/nmdm/nmdm.c
trunk/sys/dev/puc/puc.c
trunk/sys/dev/quicc/quicc_core.c
trunk/sys/dev/scc/scc_core.c
trunk/sys/dev/siis/siis.c
trunk/sys/dev/sound/pci/envy24.c
trunk/sys/dev/sound/pci/envy24ht.c
trunk/sys/dev/sound/pci/spicds.c
trunk/sys/dev/sound/pcm/ac97.c
trunk/sys/dev/sound/pcm/feeder.c
trunk/sys/dev/sound/pcm/mixer.c
trunk/sys/dev/tdfx/tdfx_pci.c
trunk/sys/dev/twa/tw_osl_freebsd.c
trunk/sys/dev/twe/twe_freebsd.c
trunk/sys/dev/uart/uart_core.c
trunk/sys/dev/xen/balloon/balloon.c
trunk/sys/dev/xen/blkback/blkback.c
trunk/sys/dev/xen/blkfront/blkfront.c
trunk/sys/fs/ntfs/ntfs_subr.c
trunk/sys/fs/smbfs/smbfs_node.c
trunk/sys/fs/udf/udf_vnops.c
trunk/sys/geom/uzip/g_uzip.c
trunk/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
trunk/sys/kern/kern_dtrace.c
trunk/sys/kern/kern_fail.c
trunk/sys/kern/kern_jail.c
trunk/sys/kern/kern_lockf.c
trunk/sys/kern/kern_rctl.c
trunk/sys/kern/kern_timeout.c
trunk/sys/kern/subr_pcpu.c
trunk/sys/kern/subr_witness.c
trunk/sys/libkern/iconv.c
trunk/sys/net/if.c
trunk/sys/net/if_arcsubr.c
trunk/sys/net/if_atmsubr.c
trunk/sys/net/if_ethersubr.c
trunk/sys/net/if_fwsubr.c
trunk/sys/net/if_iso88025subr.c
trunk/sys/net/if_spppsubr.c
trunk/sys/net/vnet.c
trunk/sys/netgraph/atm/ngatmbase.c
trunk/sys/netgraph/atm/uni/ng_uni.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
trunk/sys/netgraph/ng_async.c
trunk/sys/netgraph/ng_base.c
trunk/sys/netgraph/ng_bpf.c
trunk/sys/netgraph/ng_bridge.c
trunk/sys/netgraph/ng_deflate.c
trunk/sys/netgraph/ng_gif_demux.c
trunk/sys/netgraph/ng_hub.c
trunk/sys/netgraph/ng_iface.c
trunk/sys/netgraph/ng_ksocket.c
trunk/sys/netgraph/ng_l2tp.c
trunk/sys/netgraph/ng_mppc.c
trunk/sys/netgraph/ng_parse.c
trunk/sys/netgraph/ng_ppp.c
trunk/sys/netgraph/ng_pppoe.c
trunk/sys/netgraph/ng_pred1.c
trunk/sys/netgraph/ng_sample.c
trunk/sys/netgraph/ng_socket.c
trunk/sys/netgraph/ng_sppp.c
trunk/sys/netgraph/ng_tag.c
trunk/sys/netinet/igmp.c
trunk/sys/netinet/libalias/alias_sctp.c
trunk/sys/netinet6/mld6.c
trunk/sys/netinet6/send.c
trunk/sys/netipx/spx_reass.c
trunk/sys/nfs/nfs_lock.c
trunk/sys/security/mac_bsdextended/mac_bsdextended.c
trunk/sys/security/mac_lomac/mac_lomac.c
trunk/sys/security/mac_portacl/mac_portacl.c
Modified: trunk/sys/cam/ata/ata_da.c
===================================================================
--- trunk/sys/cam/ata/ata_da.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/ata/ata_da.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -664,7 +664,7 @@
PERIPHDRIVER_DECLARE(ada, adadriver);
-MALLOC_DEFINE(M_ATADA, "ata_da", "ata_da buffers");
+static MALLOC_DEFINE(M_ATADA, "ata_da", "ata_da buffers");
static int
adaopen(struct disk *dp)
Modified: trunk/sys/cam/ata/ata_pmp.c
===================================================================
--- trunk/sys/cam/ata/ata_pmp.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/ata/ata_pmp.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -155,7 +155,7 @@
PERIPHDRIVER_DECLARE(pmp, pmpdriver);
-MALLOC_DEFINE(M_ATPMP, "ata_pmp", "ata_pmp buffers");
+static MALLOC_DEFINE(M_ATPMP, "ata_pmp", "ata_pmp buffers");
static void
pmpinit(void)
Modified: trunk/sys/cam/cam_periph.c
===================================================================
--- trunk/sys/cam/cam_periph.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/cam_periph.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -91,7 +91,7 @@
static int initialized = 0;
struct periph_driver **periph_drivers;
-MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers");
+static MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers");
static int periph_selto_delay = 1000;
TUNABLE_INT("kern.cam.periph_selto_delay", &periph_selto_delay);
Modified: trunk/sys/cam/cam_queue.c
===================================================================
--- trunk/sys/cam/cam_queue.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/cam_queue.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -40,9 +40,9 @@
#include <cam/cam_queue.h>
#include <cam/cam_debug.h>
-MALLOC_DEFINE(M_CAMQ, "CAM queue", "CAM queue buffers");
-MALLOC_DEFINE(M_CAMDEVQ, "CAM dev queue", "CAM dev queue buffers");
-MALLOC_DEFINE(M_CAMCCBQ, "CAM ccb queue", "CAM ccb queue buffers");
+static MALLOC_DEFINE(M_CAMQ, "CAM queue", "CAM queue buffers");
+static MALLOC_DEFINE(M_CAMDEVQ, "CAM dev queue", "CAM dev queue buffers");
+static MALLOC_DEFINE(M_CAMCCBQ, "CAM ccb queue", "CAM ccb queue buffers");
static __inline int
queue_cmp(cam_pinfo **queue_array, int i, int j);
Modified: trunk/sys/cam/cam_sim.c
===================================================================
--- trunk/sys/cam/cam_sim.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/cam_sim.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -43,7 +43,7 @@
#define CAM_PATH_ANY (u_int32_t)-1
-MALLOC_DEFINE(M_CAMSIM, "CAM SIM", "CAM SIM buffers");
+static MALLOC_DEFINE(M_CAMSIM, "CAM SIM", "CAM SIM buffers");
struct cam_devq *
cam_simq_alloc(u_int32_t max_sim_transactions)
Modified: trunk/sys/cam/scsi/scsi_cd.c
===================================================================
--- trunk/sys/cam/scsi/scsi_cd.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/scsi/scsi_cd.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -335,7 +335,7 @@
static STAILQ_HEAD(changerlist, cdchanger) changerq;
static int num_changers;
-MALLOC_DEFINE(M_SCSICD, "scsi_cd", "scsi_cd buffers");
+static MALLOC_DEFINE(M_SCSICD, "scsi_cd", "scsi_cd buffers");
static void
cdinit(void)
Modified: trunk/sys/cam/scsi/scsi_ch.c
===================================================================
--- trunk/sys/cam/scsi/scsi_ch.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/scsi/scsi_ch.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -218,7 +218,7 @@
.d_name = "ch",
};
-MALLOC_DEFINE(M_SCSICH, "scsi_ch", "scsi_ch buffers");
+static MALLOC_DEFINE(M_SCSICH, "scsi_ch", "scsi_ch buffers");
static void
chinit(void)
Modified: trunk/sys/cam/scsi/scsi_da.c
===================================================================
--- trunk/sys/cam/scsi/scsi_da.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/scsi/scsi_da.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -928,7 +928,7 @@
PERIPHDRIVER_DECLARE(da, dadriver);
-MALLOC_DEFINE(M_SCSIDA, "scsi_da", "scsi_da buffers");
+static MALLOC_DEFINE(M_SCSIDA, "scsi_da", "scsi_da buffers");
static int
daopen(struct disk *dp)
Modified: trunk/sys/cam/scsi/scsi_low.c
===================================================================
--- trunk/sys/cam/scsi/scsi_low.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/scsi/scsi_low.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -145,7 +145,7 @@
#define SCSI_LOW_DISK_LFLAGS 0x0000ffff
#define SCSI_LOW_DISK_TFLAGS 0xffff0000
-MALLOC_DEFINE(M_SCSILOW, "SCSI low", "SCSI low buffers");
+static MALLOC_DEFINE(M_SCSILOW, "SCSI low", "SCSI low buffers");
/**************************************************************
* Declarations
Modified: trunk/sys/cam/scsi/scsi_sa.c
===================================================================
--- trunk/sys/cam/scsi/scsi_sa.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/scsi/scsi_sa.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -102,7 +102,7 @@
* Driver states
*/
-MALLOC_DEFINE(M_SCSISA, "SCSI sa", "SCSI sequential access buffers");
+static MALLOC_DEFINE(M_SCSISA, "SCSI sa", "SCSI sequential access buffers");
typedef enum {
SA_STATE_NORMAL, SA_STATE_ABNORMAL
Modified: trunk/sys/cam/scsi/scsi_targ_bh.c
===================================================================
--- trunk/sys/cam/scsi/scsi_targ_bh.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cam/scsi/scsi_targ_bh.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -51,7 +51,7 @@
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_message.h>
-MALLOC_DEFINE(M_SCSIBH, "SCSI bh", "SCSI blackhole buffers");
+static MALLOC_DEFINE(M_SCSIBH, "SCSI bh", "SCSI blackhole buffers");
typedef enum {
TARGBH_STATE_NORMAL,
Modified: trunk/sys/cddl/dev/cyclic/cyclic.c
===================================================================
--- trunk/sys/cddl/dev/cyclic/cyclic.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cddl/dev/cyclic/cyclic.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -339,7 +339,7 @@
static cyc_id_t *cyclic_id_head;
static cyc_backend_t cyclic_backend;
-MALLOC_DEFINE(M_CYCLIC, "cyclic", "Cyclic timer subsystem");
+static MALLOC_DEFINE(M_CYCLIC, "cyclic", "Cyclic timer subsystem");
static __inline hrtime_t
cyc_gethrtime(void)
Modified: trunk/sys/cddl/dev/fbt/fbt.c
===================================================================
--- trunk/sys/cddl/dev/fbt/fbt.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/cddl/dev/fbt/fbt.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -62,7 +62,7 @@
#include <sys/dtrace.h>
#include <sys/dtrace_bsd.h>
-MALLOC_DEFINE(M_FBT, "fbt", "Function Boundary Tracing");
+static MALLOC_DEFINE(M_FBT, "fbt", "Function Boundary Tracing");
#define FBT_PUSHL_EBP 0x55
#define FBT_MOVL_ESP_EBP0_V0 0x8b
Modified: trunk/sys/dev/aac/aac.c
===================================================================
--- trunk/sys/dev/aac/aac.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/aac/aac.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -219,7 +219,7 @@
.d_name = "aac",
};
-MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver");
+static MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver");
/* sysctl node */
static SYSCTL_NODE(_hw, OID_AUTO, aac, CTLFLAG_RD, 0, "AAC driver parameters");
Modified: trunk/sys/dev/aac/aac_cam.c
===================================================================
--- trunk/sys/dev/aac/aac_cam.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/aac/aac_cam.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -104,7 +104,7 @@
DRIVER_MODULE(aacp, aac, aac_pass_driver, aac_pass_devclass, 0, 0);
MODULE_DEPEND(aacp, cam, 1, 1, 1);
-MALLOC_DEFINE(M_AACCAM, "aaccam", "AAC CAM info");
+static MALLOC_DEFINE(M_AACCAM, "aaccam", "AAC CAM info");
static void
aac_cam_rescan(struct aac_softc *sc, uint32_t channel, uint32_t target_id)
Modified: trunk/sys/dev/acpi_support/acpi_wmi.c
===================================================================
--- trunk/sys/dev/acpi_support/acpi_wmi.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/acpi_support/acpi_wmi.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -53,7 +53,7 @@
#include <dev/acpica/acpivar.h>
#include "acpi_wmi_if.h"
-MALLOC_DEFINE(M_ACPIWMI, "acpiwmi", "ACPI-WMI mapping");
+static MALLOC_DEFINE(M_ACPIWMI, "acpiwmi", "ACPI-WMI mapping");
#define _COMPONENT ACPI_OEM
ACPI_MODULE_NAME("ACPI_WMI");
Modified: trunk/sys/dev/amr/amr.c
===================================================================
--- trunk/sys/dev/amr/amr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/amr/amr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -175,7 +175,7 @@
static int amr_linux_ioctl_int(struct cdev *dev, u_long cmd, caddr_t addr,
int32_t flag, struct thread *td);
-MALLOC_DEFINE(M_AMR, "amr", "AMR memory");
+static MALLOC_DEFINE(M_AMR, "amr", "AMR memory");
/********************************************************************************
********************************************************************************
Modified: trunk/sys/dev/amr/amr_cam.c
===================================================================
--- trunk/sys/dev/amr/amr_cam.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/amr/amr_cam.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -109,7 +109,7 @@
DRIVER_MODULE(amrp, amr, amr_pass_driver, amr_pass_devclass, 0, 0);
MODULE_DEPEND(amrp, cam, 1, 1, 1);
-MALLOC_DEFINE(M_AMRCAM, "amrcam", "AMR CAM memory");
+static MALLOC_DEFINE(M_AMRCAM, "amrcam", "AMR CAM memory");
/***********************************************************************
* Enqueue/dequeue functions
Modified: trunk/sys/dev/ciss/ciss.c
===================================================================
--- trunk/sys/dev/ciss/ciss.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/ciss/ciss.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -106,7 +106,8 @@
#include <dev/ciss/cissio.h>
#include <dev/ciss/cissvar.h>
-MALLOC_DEFINE(CISS_MALLOC_CLASS, "ciss_data", "ciss internal data buffers");
+static MALLOC_DEFINE(CISS_MALLOC_CLASS, "ciss_data",
+ "ciss internal data buffers");
/* pci interface */
static int ciss_lookup(device_t dev);
Modified: trunk/sys/dev/drm2/drm_global.h
===================================================================
--- trunk/sys/dev/drm2/drm_global.h 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/drm2/drm_global.h 2016-10-01 09:52:13 UTC (rev 9033)
@@ -54,3 +54,59 @@
MALLOC_DECLARE(M_DRM_GLOBAL);
#endif
+/**************************************************************************
+ *
+ * Copyright 2008-2009 VMware, Inc., Palo Alto, CA., USA
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+/*
+ * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
+ */
+/* $FreeBSD$ */
+
+#ifndef _DRM_GLOBAL_H_
+#define _DRM_GLOBAL_H_
+enum drm_global_types {
+ DRM_GLOBAL_TTM_MEM = 0,
+ DRM_GLOBAL_TTM_BO,
+ DRM_GLOBAL_TTM_OBJECT,
+ DRM_GLOBAL_NUM
+};
+
+struct drm_global_reference {
+ enum drm_global_types global_type;
+ size_t size;
+ void *object;
+ int (*init) (struct drm_global_reference *);
+ void (*release) (struct drm_global_reference *);
+};
+
+extern void drm_global_init(void);
+extern void drm_global_release(void);
+extern int drm_global_item_ref(struct drm_global_reference *ref);
+extern void drm_global_item_unref(struct drm_global_reference *ref);
+
+MALLOC_DECLARE(M_DRM_GLOBAL);
+
+#endif
Modified: trunk/sys/dev/firewire/fwmem.c
===================================================================
--- trunk/sys/dev/firewire/fwmem.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/firewire/fwmem.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -84,7 +84,7 @@
SYSCTL_INT(_debug, OID_AUTO, fwmem_debug, CTLFLAG_RW, &fwmem_debug, 0,
"Fwmem driver debug flag");
-MALLOC_DEFINE(M_FWMEM, "fwmem", "fwmem/FireWire");
+static MALLOC_DEFINE(M_FWMEM, "fwmem", "fwmem/FireWire");
#define MAXLEN (512 << fwmem_speed)
Modified: trunk/sys/dev/firewire/if_fwe.c
===================================================================
--- trunk/sys/dev/firewire/if_fwe.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/firewire/if_fwe.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -86,7 +86,7 @@
static int tx_speed = 2;
static int rx_queue_len = FWMAXQUEUE;
-MALLOC_DEFINE(M_FWE, "if_fwe", "Ethernet over FireWire interface");
+static MALLOC_DEFINE(M_FWE, "if_fwe", "Ethernet over FireWire interface");
SYSCTL_INT(_debug, OID_AUTO, if_fwe_debug, CTLFLAG_RW, &fwedebug, 0, "");
SYSCTL_DECL(_hw_firewire);
static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwe, CTLFLAG_RD, 0,
Modified: trunk/sys/dev/firewire/if_fwip.c
===================================================================
--- trunk/sys/dev/firewire/if_fwip.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/firewire/if_fwip.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -99,7 +99,7 @@
static int tx_speed = 2;
static int rx_queue_len = FWMAXQUEUE;
-MALLOC_DEFINE(M_FWIP, "if_fwip", "IP over FireWire interface");
+static MALLOC_DEFINE(M_FWIP, "if_fwip", "IP over FireWire interface");
SYSCTL_INT(_debug, OID_AUTO, if_fwip_debug, CTLFLAG_RW, &fwipdebug, 0, "");
SYSCTL_DECL(_hw_firewire);
static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwip, CTLFLAG_RD, 0,
Modified: trunk/sys/dev/firewire/sbp.c
===================================================================
--- trunk/sys/dev/firewire/sbp.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/firewire/sbp.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -277,7 +277,7 @@
static void sbp_timeout (void *arg);
static void sbp_mgm_orb (struct sbp_dev *, int, struct sbp_ocb *);
-MALLOC_DEFINE(M_SBP, "sbp", "SBP-II/FireWire");
+static MALLOC_DEFINE(M_SBP, "sbp", "SBP-II/FireWire");
/* cam related functions */
static void sbp_action(struct cam_sim *sim, union ccb *ccb);
Modified: trunk/sys/dev/firewire/sbp_targ.c
===================================================================
--- trunk/sys/dev/firewire/sbp_targ.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/firewire/sbp_targ.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -95,7 +95,7 @@
#define F_HOLD (1 << 3)
#define F_FREEZED (1 << 4)
-MALLOC_DEFINE(M_SBP_TARG, "sbp_targ", "SBP-II/FireWire target mode");
+static MALLOC_DEFINE(M_SBP_TARG, "sbp_targ", "SBP-II/FireWire target mode");
static int debug = 0;
Modified: trunk/sys/dev/iicbus/ad7417.c
===================================================================
--- trunk/sys/dev/iicbus/ad7417.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/iicbus/ad7417.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -121,7 +121,7 @@
static devclass_t ad7417_devclass;
DRIVER_MODULE(ad7417, iicbus, ad7417_driver, ad7417_devclass, 0, 0);
-MALLOC_DEFINE(M_AD7417, "ad7417", "Supply-Monitor AD7417");
+static MALLOC_DEFINE(M_AD7417, "ad7417", "Supply-Monitor AD7417");
static int
Modified: trunk/sys/dev/iicbus/max6690.c
===================================================================
--- trunk/sys/dev/iicbus/max6690.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/iicbus/max6690.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -101,7 +101,7 @@
static devclass_t max6690_devclass;
DRIVER_MODULE(max6690, iicbus, max6690_driver, max6690_devclass, 0, 0);
-MALLOC_DEFINE(M_MAX6690, "max6690", "Temp-Monitor MAX6690");
+static MALLOC_DEFINE(M_MAX6690, "max6690", "Temp-Monitor MAX6690");
static int
max6690_read(device_t dev, uint32_t addr, uint8_t reg, uint8_t *data)
Modified: trunk/sys/dev/iir/iir.c
===================================================================
--- trunk/sys/dev/iir/iir.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/iir/iir.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -69,7 +69,7 @@
#include <dev/iir/iir.h>
-MALLOC_DEFINE(M_GDTBUF, "iirbuf", "iir driver buffer");
+static MALLOC_DEFINE(M_GDTBUF, "iirbuf", "iir driver buffer");
struct gdt_softc *gdt_wait_gdt;
int gdt_wait_index;
Modified: trunk/sys/dev/ipmi/ipmi.c
===================================================================
--- trunk/sys/dev/ipmi/ipmi.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/ipmi/ipmi.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -76,7 +76,7 @@
.d_name = "ipmi",
};
-MALLOC_DEFINE(M_IPMI, "ipmi", "ipmi");
+static MALLOC_DEFINE(M_IPMI, "ipmi", "ipmi");
static int
ipmi_open(struct cdev *cdev, int flags, int fmt, struct thread *td)
Modified: trunk/sys/dev/iscsi/initiator/isc_subr.c
===================================================================
--- trunk/sys/dev/iscsi/initiator/isc_subr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/iscsi/initiator/isc_subr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -58,7 +58,7 @@
#include <dev/iscsi/initiator/iscsi.h>
#include <dev/iscsi/initiator/iscsivar.h>
-MALLOC_DEFINE(M_ISC, "iSC", "iSCSI driver options");
+static MALLOC_DEFINE(M_ISC, "iSC", "iSCSI driver options");
static char *
i_strdupin(char *s, size_t maxlen)
Modified: trunk/sys/dev/iscsi/initiator/iscsi.c
===================================================================
--- trunk/sys/dev/iscsi/initiator/iscsi.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/iscsi/initiator/iscsi.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -66,7 +66,7 @@
MALLOC_DEFINE(M_ISCSI, "iSCSI", "iSCSI driver");
MALLOC_DEFINE(M_ISCSIBUF, "iSCbuf", "iSCSI buffers");
-MALLOC_DEFINE(M_TMP, "iSCtmp", "iSCSI tmp");
+static MALLOC_DEFINE(M_TMP, "iSCtmp", "iSCSI tmp");
#ifdef ISCSI_INITIATOR_DEBUG
int iscsi_debug = ISCSI_INITIATOR_DEBUG;
Modified: trunk/sys/dev/malo/if_malo.c
===================================================================
--- trunk/sys/dev/malo/if_malo.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/malo/if_malo.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -123,7 +123,7 @@
} while (0)
#endif
-MALLOC_DEFINE(M_MALODEV, "malodev", "malo driver dma buffers");
+static MALLOC_DEFINE(M_MALODEV, "malodev", "malo driver dma buffers");
static struct ieee80211vap *malo_vap_create(struct ieee80211com *,
const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
Modified: trunk/sys/dev/mvs/mvs.c
===================================================================
--- trunk/sys/dev/mvs/mvs.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/mvs/mvs.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -94,7 +94,7 @@
static void mvsaction(struct cam_sim *sim, union ccb *ccb);
static void mvspoll(struct cam_sim *sim);
-MALLOC_DEFINE(M_MVS, "MVS driver", "MVS driver data buffers");
+static MALLOC_DEFINE(M_MVS, "MVS driver", "MVS driver data buffers");
#define recovery_type spriv_field0
#define RECOVERY_NONE 0
Modified: trunk/sys/dev/mwl/if_mwl.c
===================================================================
--- trunk/sys/dev/mwl/if_mwl.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/mwl/if_mwl.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -262,7 +262,7 @@
} while (0)
#endif
-MALLOC_DEFINE(M_MWLDEV, "mwldev", "mwl driver dma buffers");
+static MALLOC_DEFINE(M_MWLDEV, "mwldev", "mwl driver dma buffers");
/*
* Each packet has fixed front matter: a 2-byte length
Modified: trunk/sys/dev/nmdm/nmdm.c
===================================================================
--- trunk/sys/dev/nmdm/nmdm.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/nmdm/nmdm.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -52,7 +52,7 @@
#include <sys/malloc.h>
#include <sys/taskqueue.h>
-MALLOC_DEFINE(M_NMDM, "nullmodem", "nullmodem data structures");
+static MALLOC_DEFINE(M_NMDM, "nullmodem", "nullmodem data structures");
static tsw_inwakeup_t nmdm_outwakeup;
static tsw_outwakeup_t nmdm_inwakeup;
Modified: trunk/sys/dev/puc/puc.c
===================================================================
--- trunk/sys/dev/puc/puc.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/puc/puc.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -68,7 +68,7 @@
devclass_t puc_devclass;
const char puc_driver_name[] = "puc";
-MALLOC_DEFINE(M_PUC, "PUC", "PUC driver");
+static MALLOC_DEFINE(M_PUC, "PUC", "PUC driver");
struct puc_bar *
puc_get_bar(struct puc_softc *sc, int rid)
Modified: trunk/sys/dev/quicc/quicc_core.c
===================================================================
--- trunk/sys/dev/quicc/quicc_core.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/quicc/quicc_core.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -61,7 +61,7 @@
devclass_t quicc_devclass;
char quicc_driver_name[] = "quicc";
-MALLOC_DEFINE(M_QUICC, "QUICC", "QUICC driver");
+static MALLOC_DEFINE(M_QUICC, "QUICC", "QUICC driver");
struct quicc_device {
struct rman *qd_rman;
Modified: trunk/sys/dev/scc/scc_core.c
===================================================================
--- trunk/sys/dev/scc/scc_core.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/scc/scc_core.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -48,7 +48,7 @@
devclass_t scc_devclass;
char scc_driver_name[] = "scc";
-MALLOC_DEFINE(M_SCC, "SCC", "SCC driver");
+static MALLOC_DEFINE(M_SCC, "SCC", "SCC driver");
static int
scc_bfe_intr(void *arg)
Modified: trunk/sys/dev/siis/siis.c
===================================================================
--- trunk/sys/dev/siis/siis.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/siis/siis.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -91,7 +91,7 @@
static void siisaction(struct cam_sim *sim, union ccb *ccb);
static void siispoll(struct cam_sim *sim);
-MALLOC_DEFINE(M_SIIS, "SIIS driver", "SIIS driver data buffers");
+static MALLOC_DEFINE(M_SIIS, "SIIS driver", "SIIS driver data buffers");
static struct {
uint32_t id;
Modified: trunk/sys/dev/sound/pci/envy24.c
===================================================================
--- trunk/sys/dev/sound/pci/envy24.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/sound/pci/envy24.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -41,7 +41,7 @@
SND_DECLARE_FILE("$MidnightBSD$");
-MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio");
+static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio");
/* -------------------------------------------------------------------- */
Modified: trunk/sys/dev/sound/pci/envy24ht.c
===================================================================
--- trunk/sys/dev/sound/pci/envy24ht.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/sound/pci/envy24ht.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -53,7 +53,7 @@
SND_DECLARE_FILE("$MidnightBSD$");
-MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio");
+static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio");
/* -------------------------------------------------------------------- */
Modified: trunk/sys/dev/sound/pci/spicds.c
===================================================================
--- trunk/sys/dev/sound/pci/spicds.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/sound/pci/spicds.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -35,7 +35,7 @@
#include <dev/sound/pci/spicds.h>
-MALLOC_DEFINE(M_SPICDS, "spicds", "SPI codec");
+static MALLOC_DEFINE(M_SPICDS, "spicds", "SPI codec");
#define SPICDS_NAMELEN 16
struct spicds_info {
Modified: trunk/sys/dev/sound/pcm/ac97.c
===================================================================
--- trunk/sys/dev/sound/pcm/ac97.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/sound/pcm/ac97.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -38,7 +38,7 @@
SND_DECLARE_FILE("$MidnightBSD$");
-MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
+static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
struct ac97mixtable_entry {
int reg; /* register index */
Modified: trunk/sys/dev/sound/pcm/feeder.c
===================================================================
--- trunk/sys/dev/sound/pcm/feeder.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/sound/pcm/feeder.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -35,7 +35,7 @@
SND_DECLARE_FILE("$MidnightBSD$");
-MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
+static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
#define MAXFEEDERS 256
#undef FEEDER_DEBUG
Modified: trunk/sys/dev/sound/pcm/mixer.c
===================================================================
--- trunk/sys/dev/sound/pcm/mixer.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/sound/pcm/mixer.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -37,7 +37,7 @@
SND_DECLARE_FILE("$MidnightBSD$");
-MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
+static MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
static int mixer_bypass = 1;
TUNABLE_INT("hw.snd.vpc_mixer_bypass", &mixer_bypass);
Modified: trunk/sys/dev/tdfx/tdfx_pci.c
===================================================================
--- trunk/sys/dev/tdfx/tdfx_pci.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/tdfx/tdfx_pci.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -89,7 +89,7 @@
{ 0, 0 }
};
-MALLOC_DEFINE(M_TDFX,"tdfx_driver","3DFX Graphics[/2D]/3D Accelerator(s)");
+static MALLOC_DEFINE(M_TDFX,"tdfx_driver","3DFX Graphics[/2D]/3D Accelerators");
/* Char. Dev. file operations structure */
static struct cdevsw tdfx_cdev = {
Modified: trunk/sys/dev/twa/tw_osl_freebsd.c
===================================================================
--- trunk/sys/dev/twa/tw_osl_freebsd.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/twa/tw_osl_freebsd.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -55,7 +55,7 @@
TW_INT32 TW_OSL_DEBUG_LEVEL_FOR_CL = TW_OSL_DEBUG;
#endif /* TW_OSL_DEBUG */
-MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa_commands", "twa commands");
+static MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa_commands", "twa commands");
static d_open_t twa_open;
Modified: trunk/sys/dev/twe/twe_freebsd.c
===================================================================
--- trunk/sys/dev/twe/twe_freebsd.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/twe/twe_freebsd.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -879,7 +879,7 @@
/********************************************************************************
* Allocate a command buffer
*/
-MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe_commands", "twe commands");
+static MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe_commands", "twe commands");
struct twe_request *
twe_allocate_request(struct twe_softc *sc, int tag)
Modified: trunk/sys/dev/uart/uart_core.c
===================================================================
--- trunk/sys/dev/uart/uart_core.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/uart/uart_core.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -56,7 +56,7 @@
SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs =
SLIST_HEAD_INITIALIZER(uart_sysdevs);
-MALLOC_DEFINE(M_UART, "UART", "UART driver");
+static MALLOC_DEFINE(M_UART, "UART", "UART driver");
void
uart_add_sysdev(struct uart_devinfo *di)
Modified: trunk/sys/dev/xen/balloon/balloon.c
===================================================================
--- trunk/sys/dev/xen/balloon/balloon.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/xen/balloon/balloon.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -49,7 +49,7 @@
#include <vm/vm.h>
#include <vm/vm_page.h>
-MALLOC_DEFINE(M_BALLOON, "Balloon", "Xen Balloon Driver");
+static MALLOC_DEFINE(M_BALLOON, "Balloon", "Xen Balloon Driver");
struct mtx balloon_mutex;
Modified: trunk/sys/dev/xen/blkback/blkback.c
===================================================================
--- trunk/sys/dev/xen/blkback/blkback.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/xen/blkback/blkback.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -124,7 +124,7 @@
/**
* Custom malloc type for all driver allocations.
*/
-MALLOC_DEFINE(M_XENBLOCKBACK, "xbbd", "Xen Block Back Driver Data");
+static MALLOC_DEFINE(M_XENBLOCKBACK, "xbbd", "Xen Block Back Driver Data");
#ifdef XBB_DEBUG
#define DPRINTF(fmt, args...) \
Modified: trunk/sys/dev/xen/blkfront/blkfront.c
===================================================================
--- trunk/sys/dev/xen/blkfront/blkfront.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/dev/xen/blkfront/blkfront.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -82,7 +82,7 @@
static void blkif_free(struct xb_softc *);
static void blkif_queue_cb(void *, bus_dma_segment_t *, int, int);
-MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
+static MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
#define GRANT_INVALID_REF 0
Modified: trunk/sys/fs/ntfs/ntfs_subr.c
===================================================================
--- trunk/sys/fs/ntfs/ntfs_subr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/fs/ntfs/ntfs_subr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -51,10 +51,12 @@
#include <fs/ntfs/ntfs_compr.h>
#include <fs/ntfs/ntfs_ihash.h>
-MALLOC_DEFINE(M_NTFSNTVATTR, "ntfs_vattr", "NTFS file attribute information");
-MALLOC_DEFINE(M_NTFSRDATA, "ntfsd_resdata", "NTFS resident data");
-MALLOC_DEFINE(M_NTFSRUN, "ntfs_vrun", "NTFS vrun storage");
-MALLOC_DEFINE(M_NTFSDECOMP, "ntfs_decomp", "NTFS decompression temporary");
+static MALLOC_DEFINE(M_NTFSNTVATTR, "ntfs_vattr",
+ "NTFS file attribute information");
+static MALLOC_DEFINE(M_NTFSRDATA, "ntfsd_resdata", "NTFS resident data");
+static MALLOC_DEFINE(M_NTFSRUN, "ntfs_vrun", "NTFS vrun storage");
+static MALLOC_DEFINE(M_NTFSDECOMP, "ntfs_decomp",
+ "NTFS decompression temporary");
static int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **);
static int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t);
Modified: trunk/sys/fs/smbfs/smbfs_node.c
===================================================================
--- trunk/sys/fs/smbfs/smbfs_node.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/fs/smbfs/smbfs_node.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -58,7 +58,7 @@
extern struct vop_vector smbfs_vnodeops; /* XXX -> .h file */
-MALLOC_DEFINE(M_SMBNODE, "smbufs_node", "SMBFS vnode private part");
+static MALLOC_DEFINE(M_SMBNODE, "smbufs_node", "SMBFS vnode private part");
static MALLOC_DEFINE(M_SMBNODENAME, "smbufs_nname", "SMBFS node name");
int smbfs_hashprint(struct mount *mp);
Modified: trunk/sys/fs/udf/udf_vnops.c
===================================================================
--- trunk/sys/fs/udf/udf_vnops.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/fs/udf/udf_vnops.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -107,8 +107,8 @@
.vop_vptofh = udf_vptofh,
};
-MALLOC_DEFINE(M_UDFFID, "udf_fid", "UDF FileId structure");
-MALLOC_DEFINE(M_UDFDS, "udf_ds", "UDF Dirstream structure");
+static MALLOC_DEFINE(M_UDFFID, "udf_fid", "UDF FileId structure");
+static MALLOC_DEFINE(M_UDFDS, "udf_ds", "UDF Dirstream structure");
#define UDF_INVALID_BMAP -1
Modified: trunk/sys/geom/uzip/g_uzip.c
===================================================================
--- trunk/sys/geom/uzip/g_uzip.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/geom/uzip/g_uzip.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/uzip/g_uzip.c,v 1.3 2008/12/03 00:25:51 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004 Max Khon
* All rights reserved.
@@ -51,7 +51,7 @@
#define DPRINTF(a)
#endif
-MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
+static MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
#define UZIP_CLASS_NAME "UZIP"
Modified: trunk/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
===================================================================
--- trunk/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c,v 1.2 2008/12/03 00:25:55 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*
* Copyright (c) 2001,2006 Alexander Kabaev, Russell Cattelan Digital Elves Inc.
* All rights reserved.
@@ -72,7 +72,7 @@
#include <xfs_mountops.h>
-MALLOC_DEFINE(M_XFSNODE, "XFS node", "XFS vnode private part");
+static MALLOC_DEFINE(M_XFSNODE, "XFS node", "XFS vnode private part");
static vfs_mount_t _xfs_mount;
static vfs_unmount_t _xfs_unmount;
Modified: trunk/sys/kern/kern_dtrace.c
===================================================================
--- trunk/sys/kern/kern_dtrace.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/kern_dtrace.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -45,7 +45,7 @@
FEATURE(kdtrace_hooks,
"Kernel DTrace hooks which are required to load DTrace kernel modules");
-MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks");
+static MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks");
/* Return the DTrace process data size compiled in the kernel hooks. */
size_t
Modified: trunk/sys/kern/kern_fail.c
===================================================================
--- trunk/sys/kern/kern_fail.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/kern_fail.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -69,7 +69,7 @@
ILOG_DEFINE_FOR_FILE(L_ISI_FAIL_POINT, L_ILOG, fail_point);
#endif
-MALLOC_DEFINE(M_FAIL_POINT, "Fail Points", "fail points system");
+static MALLOC_DEFINE(M_FAIL_POINT, "Fail Points", "fail points system");
#define fp_free(ptr) free(ptr, M_FAIL_POINT)
#define fp_malloc(size, flags) malloc((size), M_FAIL_POINT, (flags))
Modified: trunk/sys/kern/kern_jail.c
===================================================================
--- trunk/sys/kern/kern_jail.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/kern_jail.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -78,7 +78,7 @@
#define DEFAULT_HOSTUUID "00000000-0000-0000-0000-000000000000"
MALLOC_DEFINE(M_PRISON, "prison", "Prison structures");
-MALLOC_DEFINE(M_PRISON_RACCT, "prison_racct", "Prison racct structures");
+static MALLOC_DEFINE(M_PRISON_RACCT, "prison_racct", "Prison racct structures");
/* Keep struct prison prison0 and some code in kern_jail_set() readable. */
#ifdef INET
Modified: trunk/sys/kern/kern_lockf.c
===================================================================
--- trunk/sys/kern/kern_lockf.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/kern_lockf.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -90,7 +90,7 @@
SYSCTL_INT(_debug, OID_AUTO, lockf_debug, CTLFLAG_RW, &lockf_debug, 0, "");
#endif
-MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures");
+static MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures");
struct owner_edge;
struct owner_vertex;
Modified: trunk/sys/kern/kern_rctl.c
===================================================================
--- trunk/sys/kern/kern_rctl.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/kern_rctl.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -170,7 +170,7 @@
static int rctl_rule_fully_specified(const struct rctl_rule *rule);
static void rctl_rule_to_sbuf(struct sbuf *sb, const struct rctl_rule *rule);
-MALLOC_DEFINE(M_RCTL, "rctl", "Resource Limits");
+static MALLOC_DEFINE(M_RCTL, "rctl", "Resource Limits");
static const char *
rctl_subject_type_name(int subject)
Modified: trunk/sys/kern/kern_timeout.c
===================================================================
--- trunk/sys/kern/kern_timeout.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/kern_timeout.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -156,7 +156,7 @@
static int timeout_cpu;
void (*callout_new_inserted)(int cpu, int ticks) = NULL;
-MALLOC_DEFINE(M_CALLOUT, "callout", "Callout datastructures");
+static MALLOC_DEFINE(M_CALLOUT, "callout", "Callout datastructures");
/**
* Locked by cc_lock:
Modified: trunk/sys/kern/subr_pcpu.c
===================================================================
--- trunk/sys/kern/subr_pcpu.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/subr_pcpu.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -61,7 +61,7 @@
#include <sys/sx.h>
#include <ddb/ddb.h>
-MALLOC_DEFINE(M_PCPU, "Per-cpu", "Per-cpu resource accouting.");
+static MALLOC_DEFINE(M_PCPU, "Per-cpu", "Per-cpu resource accouting.");
struct dpcpu_free {
uintptr_t df_start;
Modified: trunk/sys/kern/subr_witness.c
===================================================================
--- trunk/sys/kern/subr_witness.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/kern/subr_witness.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -184,7 +184,7 @@
#define WITNESS_INDEX_ASSERT(i) \
MPASS((i) > 0 && (i) <= w_max_used_index && (i) < WITNESS_COUNT)
-MALLOC_DEFINE(M_WITNESS, "Witness", "Witness");
+static MALLOC_DEFINE(M_WITNESS, "Witness", "Witness");
/*
* Lock instances. A lock instance is the data associated with a lock while
Modified: trunk/sys/libkern/iconv.c
===================================================================
--- trunk/sys/libkern/iconv.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/libkern/iconv.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -42,7 +42,7 @@
SYSCTL_NODE(_kern, OID_AUTO, iconv, CTLFLAG_RW, NULL, "kernel iconv interface");
MALLOC_DEFINE(M_ICONV, "iconv", "ICONV structures");
-MALLOC_DEFINE(M_ICONVDATA, "iconv_data", "ICONV data");
+static MALLOC_DEFINE(M_ICONVDATA, "iconv_data", "ICONV data");
MODULE_VERSION(libiconv, 2);
Modified: trunk/sys/net/if.c
===================================================================
--- trunk/sys/net/if.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/if.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -118,7 +118,7 @@
&ifdescr_maxlen, 0,
"administrative maximum length for interface description");
-MALLOC_DEFINE(M_IFDESCR, "ifdescr", "ifnet descriptions");
+static MALLOC_DEFINE(M_IFDESCR, "ifdescr", "ifnet descriptions");
/* global sx for non-critical path ifdescr */
static struct sx ifdescr_sx;
@@ -215,7 +215,7 @@
static if_com_alloc_t *if_com_alloc[256];
static if_com_free_t *if_com_free[256];
-MALLOC_DEFINE(M_IFNET, "ifnet", "interface internals");
+static MALLOC_DEFINE(M_IFNET, "ifnet", "interface internals");
MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address");
MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address");
Modified: trunk/sys/net/if_arcsubr.c
===================================================================
--- trunk/sys/net/if_arcsubr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/if_arcsubr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -837,7 +837,7 @@
}
}
-MALLOC_DEFINE(M_ARCCOM, "arccom", "ARCNET interface internals");
+static MALLOC_DEFINE(M_ARCCOM, "arccom", "ARCNET interface internals");
static void*
arc_alloc(u_char type, struct ifnet *ifp)
Modified: trunk/sys/net/if_atmsubr.c
===================================================================
--- trunk/sys/net/if_atmsubr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/if_atmsubr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -98,7 +98,7 @@
SYSCTL_NODE(_hw, OID_AUTO, atm, CTLFLAG_RW, 0, "ATM hardware");
-MALLOC_DEFINE(M_IFATM, "ifatm", "atm interface internals");
+static MALLOC_DEFINE(M_IFATM, "ifatm", "atm interface internals");
#ifndef ETHERTYPE_IPV6
#define ETHERTYPE_IPV6 0x86dd
Modified: trunk/sys/net/if_ethersubr.c
===================================================================
--- trunk/sys/net/if_ethersubr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/if_ethersubr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -134,7 +134,7 @@
#endif
/* XXX: should be in an arp support file, not here */
-MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* interface internals");
+static MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* interface internals");
#define ETHER_IS_BROADCAST(addr) \
(bcmp(etherbroadcastaddr, (addr), ETHER_ADDR_LEN) == 0)
Modified: trunk/sys/net/if_fwsubr.c
===================================================================
--- trunk/sys/net/if_fwsubr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/if_fwsubr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -63,7 +63,7 @@
#include <security/mac/mac_framework.h>
-MALLOC_DEFINE(M_FWCOM, "fw_com", "firewire interface internals");
+static MALLOC_DEFINE(M_FWCOM, "fw_com", "firewire interface internals");
struct fw_hwaddr firewire_broadcastaddr = {
0xffffffff,
Modified: trunk/sys/net/if_iso88025subr.c
===================================================================
--- trunk/sys/net/if_iso88025subr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/if_iso88025subr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -781,7 +781,7 @@
return (0);
}
-MALLOC_DEFINE(M_ISO88025, "arpcom", "802.5 interface internals");
+static MALLOC_DEFINE(M_ISO88025, "arpcom", "802.5 interface internals");
static void*
iso88025_alloc(u_char type, struct ifnet *ifp)
Modified: trunk/sys/net/if_spppsubr.c
===================================================================
--- trunk/sys/net/if_spppsubr.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/if_spppsubr.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -174,7 +174,7 @@
#define STATE_ACK_SENT 8
#define STATE_OPENED 9
-MALLOC_DEFINE(M_SPPP, "sppp", "synchronous PPP interface internals");
+static MALLOC_DEFINE(M_SPPP, "sppp", "synchronous PPP interface internals");
struct ppp_header {
u_char address;
Modified: trunk/sys/net/vnet.c
===================================================================
--- trunk/sys/net/vnet.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/net/vnet.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -81,7 +81,7 @@
FEATURE(vimage, "VIMAGE kernel virtualization");
-MALLOC_DEFINE(M_VNET, "vnet", "network stack control block");
+static MALLOC_DEFINE(M_VNET, "vnet", "network stack control block");
/*
* The virtual network stack list has two read-write locks, one sleepable and
@@ -161,7 +161,7 @@
*/
#define VNET_BYTES (VNET_STOP - VNET_START)
-MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data");
+static MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data");
/*
* VNET_MODMIN is the minimum number of bytes we will reserve for the sum of
@@ -203,7 +203,8 @@
TAILQ_ENTRY(vnet_data_free) vnd_link;
};
-MALLOC_DEFINE(M_VNET_DATA_FREE, "vnet_data_free", "VNET resource accounting");
+static MALLOC_DEFINE(M_VNET_DATA_FREE, "vnet_data_free",
+ "VNET resource accounting");
static TAILQ_HEAD(, vnet_data_free) vnet_data_free_head =
TAILQ_HEAD_INITIALIZER(vnet_data_free_head);
static struct sx vnet_data_free_lock;
Modified: trunk/sys/netgraph/atm/ngatmbase.c
===================================================================
--- trunk/sys/netgraph/atm/ngatmbase.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/atm/ngatmbase.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -61,8 +61,8 @@
/*
* UNI Stack message handling functions
*/
-MALLOC_DEFINE(M_UNIMSG, "unimsg", "uni message buffers");
-MALLOC_DEFINE(M_UNIMSGHDR, "unimsghdr", "uni message headers");
+static MALLOC_DEFINE(M_UNIMSG, "unimsg", "uni message buffers");
+static MALLOC_DEFINE(M_UNIMSGHDR, "unimsghdr", "uni message headers");
#define EXTRA 128
Modified: trunk/sys/netgraph/atm/uni/ng_uni.c
===================================================================
--- trunk/sys/netgraph/atm/uni/ng_uni.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/atm/uni/ng_uni.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -60,8 +60,8 @@
#include <netgraph/atm/ng_sscfu.h>
#include <netgraph/atm/ng_uni.h>
-MALLOC_DEFINE(M_NG_UNI, "netgraph_uni_node", "netgraph uni node");
-MALLOC_DEFINE(M_UNI, "netgraph_uni_data", "uni protocol data");
+static MALLOC_DEFINE(M_NG_UNI, "netgraph_uni_node", "netgraph uni node");
+static MALLOC_DEFINE(M_UNI, "netgraph_uni_data", "uni protocol data");
MODULE_DEPEND(ng_uni, ngatmbase, 1, 1, 1);
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -61,7 +61,7 @@
/* MALLOC define */
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_HCI_RAW, "netgraph_btsocks_hci_raw",
+static MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_HCI_RAW, "netgraph_btsocks_hci_raw",
"Netgraph Bluetooth raw HCI sockets");
#else
#define M_NETGRAPH_BTSOCKET_HCI_RAW M_NETGRAPH
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -63,7 +63,7 @@
/* MALLOC define */
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_L2CAP, "netgraph_btsocks_l2cap",
+static MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_L2CAP, "netgraph_btsocks_l2cap",
"Netgraph Bluetooth L2CAP sockets");
#else
#define M_NETGRAPH_BTSOCKET_L2CAP M_NETGRAPH
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -60,8 +60,8 @@
/* MALLOC define */
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_L2CAP_RAW, "netgraph_btsocks_l2cap_raw",
- "Netgraph Bluetooth raw L2CAP sockets");
+static MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_L2CAP_RAW,
+ "netgraph_btsocks_l2cap_raw", "Netgraph Bluetooth raw L2CAP sockets");
#else
#define M_NETGRAPH_BTSOCKET_L2CAP_RAW M_NETGRAPH
#endif /* NG_SEPARATE_MALLOC */
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -66,7 +66,7 @@
/* MALLOC define */
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_RFCOMM, "netgraph_btsocks_rfcomm",
+static MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_RFCOMM, "netgraph_btsocks_rfcomm",
"Netgraph Bluetooth RFCOMM sockets");
#else
#define M_NETGRAPH_BTSOCKET_RFCOMM M_NETGRAPH
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -63,7 +63,7 @@
/* MALLOC define */
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_SCO, "netgraph_btsocks_sco",
+static MALLOC_DEFINE(M_NETGRAPH_BTSOCKET_SCO, "netgraph_btsocks_sco",
"Netgraph Bluetooth SCO sockets");
#else
#define M_NETGRAPH_BTSOCKET_SCO M_NETGRAPH
Modified: trunk/sys/netgraph/ng_async.c
===================================================================
--- trunk/sys/netgraph/ng_async.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_async.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -62,7 +62,7 @@
#include <net/ppp_defs.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_ASYNC, "netgraph_async", "netgraph async node ");
+static MALLOC_DEFINE(M_NETGRAPH_ASYNC, "netgraph_async", "netgraph async node");
#else
#define M_NETGRAPH_ASYNC M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_base.c
===================================================================
--- trunk/sys/netgraph/ng_base.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_base.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -243,10 +243,13 @@
/* Our own netgraph malloc type */
MALLOC_DEFINE(M_NETGRAPH, "netgraph", "netgraph structures and ctrl messages");
-MALLOC_DEFINE(M_NETGRAPH_HOOK, "netgraph_hook", "netgraph hook structures");
-MALLOC_DEFINE(M_NETGRAPH_NODE, "netgraph_node", "netgraph node structures");
-MALLOC_DEFINE(M_NETGRAPH_ITEM, "netgraph_item", "netgraph item structures");
MALLOC_DEFINE(M_NETGRAPH_MSG, "netgraph_msg", "netgraph name storage");
+static MALLOC_DEFINE(M_NETGRAPH_HOOK, "netgraph_hook",
+ "netgraph hook structures");
+static MALLOC_DEFINE(M_NETGRAPH_NODE, "netgraph_node",
+ "netgraph node structures");
+static MALLOC_DEFINE(M_NETGRAPH_ITEM, "netgraph_item",
+ "netgraph item structures");
/* Should not be visible outside this file */
Modified: trunk/sys/netgraph/ng_bpf.c
===================================================================
--- trunk/sys/netgraph/ng_bpf.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_bpf.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -75,7 +75,7 @@
#include <netgraph/ng_bpf.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_BPF, "netgraph_bpf", "netgraph bpf node ");
+static MALLOC_DEFINE(M_NETGRAPH_BPF, "netgraph_bpf", "netgraph bpf node");
#else
#define M_NETGRAPH_BPF M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_bridge.c
===================================================================
--- trunk/sys/netgraph/ng_bridge.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_bridge.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -85,7 +85,8 @@
#include <netgraph/ng_bridge.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_BRIDGE, "netgraph_bridge", "netgraph bridge node");
+static MALLOC_DEFINE(M_NETGRAPH_BRIDGE, "netgraph_bridge",
+ "netgraph bridge node");
#else
#define M_NETGRAPH_BRIDGE M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_deflate.c
===================================================================
--- trunk/sys/netgraph/ng_deflate.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_deflate.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -50,7 +50,8 @@
#include "opt_netgraph.h"
-MALLOC_DEFINE(M_NETGRAPH_DEFLATE, "netgraph_deflate", "netgraph deflate node ");
+static MALLOC_DEFINE(M_NETGRAPH_DEFLATE, "netgraph_deflate",
+ "netgraph deflate node");
/* DEFLATE header length */
#define DEFLATE_HDRLEN 2
Modified: trunk/sys/netgraph/ng_gif_demux.c
===================================================================
--- trunk/sys/netgraph/ng_gif_demux.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_gif_demux.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -90,7 +90,7 @@
#include <netgraph/ng_gif_demux.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_GIF_DEMUX, "netgraph_gif_demux",
+static MALLOC_DEFINE(M_NETGRAPH_GIF_DEMUX, "netgraph_gif_demux",
"netgraph gif demux node");
#else
#define M_NETGRAPH_GIF_DEMUX M_NETGRAPH
Modified: trunk/sys/netgraph/ng_hub.c
===================================================================
--- trunk/sys/netgraph/ng_hub.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_hub.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -38,7 +38,7 @@
#include <netgraph/netgraph.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_HUB, "netgraph_hub", "netgraph hub node");
+static MALLOC_DEFINE(M_NETGRAPH_HUB, "netgraph_hub", "netgraph hub node");
#else
#define M_NETGRAPH_HUB M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_iface.c
===================================================================
--- trunk/sys/netgraph/ng_iface.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_iface.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -88,7 +88,7 @@
#include <netgraph/ng_cisco.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_IFACE, "netgraph_iface", "netgraph iface node ");
+static MALLOC_DEFINE(M_NETGRAPH_IFACE, "netgraph_iface", "netgraph iface node");
#else
#define M_NETGRAPH_IFACE M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_ksocket.c
===================================================================
--- trunk/sys/netgraph/ng_ksocket.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_ksocket.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -70,7 +70,8 @@
#include <netatalk/at.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_KSOCKET, "netgraph_ksock", "netgraph ksock node ");
+static MALLOC_DEFINE(M_NETGRAPH_KSOCKET, "netgraph_ksock",
+ "netgraph ksock node");
#else
#define M_NETGRAPH_KSOCKET M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_l2tp.c
===================================================================
--- trunk/sys/netgraph/ng_l2tp.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_l2tp.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -63,7 +63,7 @@
#include <netgraph/ng_l2tp.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_L2TP, "netgraph_l2tp", "netgraph l2tp node");
+static MALLOC_DEFINE(M_NETGRAPH_L2TP, "netgraph_l2tp", "netgraph l2tp node");
#else
#define M_NETGRAPH_L2TP M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_mppc.c
===================================================================
--- trunk/sys/netgraph/ng_mppc.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_mppc.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -75,7 +75,7 @@
#endif
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_MPPC, "netgraph_mppc", "netgraph mppc node ");
+static MALLOC_DEFINE(M_NETGRAPH_MPPC, "netgraph_mppc", "netgraph mppc node");
#else
#define M_NETGRAPH_MPPC M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_parse.c
===================================================================
--- trunk/sys/netgraph/ng_parse.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_parse.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -63,7 +63,7 @@
#include <netgraph/ng_parse.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_PARSE, "netgraph_parse", "netgraph parse info");
+static MALLOC_DEFINE(M_NETGRAPH_PARSE, "netgraph_parse", "netgraph parse info");
#else
#define M_NETGRAPH_PARSE M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_ppp.c
===================================================================
--- trunk/sys/netgraph/ng_ppp.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_ppp.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -109,7 +109,7 @@
#include <netgraph/ng_vjc.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_PPP, "netgraph_ppp", "netgraph ppp node");
+static MALLOC_DEFINE(M_NETGRAPH_PPP, "netgraph_ppp", "netgraph ppp node");
#else
#define M_NETGRAPH_PPP M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_pppoe.c
===================================================================
--- trunk/sys/netgraph/ng_pppoe.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_pppoe.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -59,7 +59,7 @@
#include <netgraph/ng_ether.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_PPPOE, "netgraph_pppoe", "netgraph pppoe node");
+static MALLOC_DEFINE(M_NETGRAPH_PPPOE, "netgraph_pppoe", "netgraph pppoe node");
#else
#define M_NETGRAPH_PPPOE M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_pred1.c
===================================================================
--- trunk/sys/netgraph/ng_pred1.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_pred1.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -47,7 +47,7 @@
#include "opt_netgraph.h"
-MALLOC_DEFINE(M_NETGRAPH_PRED1, "netgraph_pred1", "netgraph pred1 node ");
+static MALLOC_DEFINE(M_NETGRAPH_PRED1, "netgraph_pred1", "netgraph pred1 node");
/* PRED1 header length */
#define PRED1_HDRLEN 2
Modified: trunk/sys/netgraph/ng_sample.c
===================================================================
--- trunk/sys/netgraph/ng_sample.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_sample.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -59,7 +59,7 @@
/* If you do complicated mallocs you may want to do this */
/* and use it for your mallocs */
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_XXX, "netgraph_xxx", "netgraph xxx node ");
+static MALLOC_DEFINE(M_NETGRAPH_XXX, "netgraph_xxx", "netgraph xxx node");
#else
#define M_NETGRAPH_XXX M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_socket.c
===================================================================
--- trunk/sys/netgraph/ng_socket.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_socket.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -75,8 +75,8 @@
#include <netgraph/ng_socket.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_PATH, "netgraph_path", "netgraph path info ");
-MALLOC_DEFINE(M_NETGRAPH_SOCK, "netgraph_sock", "netgraph socket info ");
+static MALLOC_DEFINE(M_NETGRAPH_PATH, "netgraph_path", "netgraph path info");
+static MALLOC_DEFINE(M_NETGRAPH_SOCK, "netgraph_sock", "netgraph socket info");
#else
#define M_NETGRAPH_PATH M_NETGRAPH
#define M_NETGRAPH_SOCK M_NETGRAPH
Modified: trunk/sys/netgraph/ng_sppp.c
===================================================================
--- trunk/sys/netgraph/ng_sppp.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_sppp.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -45,7 +45,7 @@
#include <netgraph/ng_sppp.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_SPPP, "netgraph_sppp", "netgraph sppp node ");
+static MALLOC_DEFINE(M_NETGRAPH_SPPP, "netgraph_sppp", "netgraph sppp node");
#else
#define M_NETGRAPH_SPPP M_NETGRAPH
#endif
Modified: trunk/sys/netgraph/ng_tag.c
===================================================================
--- trunk/sys/netgraph/ng_tag.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netgraph/ng_tag.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -70,7 +70,7 @@
#include <netgraph/ng_tag.h>
#ifdef NG_SEPARATE_MALLOC
-MALLOC_DEFINE(M_NETGRAPH_TAG, "netgraph_tag", "netgraph tag node ");
+static MALLOC_DEFINE(M_NETGRAPH_TAG, "netgraph_tag", "netgraph tag node");
#else
#define M_NETGRAPH_TAG M_NETGRAPH
#endif
Modified: trunk/sys/netinet/igmp.c
===================================================================
--- trunk/sys/netinet/igmp.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netinet/igmp.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -185,7 +185,7 @@
struct mtx igmp_mtx;
struct mbuf *m_raopt; /* Router Alert option */
-MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");
+static MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");
/*
* VIMAGE-wide globals.
Modified: trunk/sys/netinet/libalias/alias_sctp.c
===================================================================
--- trunk/sys/netinet/libalias/alias_sctp.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netinet/libalias/alias_sctp.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -181,7 +181,7 @@
#ifdef _KERNEL
-MALLOC_DEFINE(M_SCTPNAT, "sctpnat", "sctp nat dbs");
+static MALLOC_DEFINE(M_SCTPNAT, "sctpnat", "sctp nat dbs");
/* Use kernel allocator. */
#ifdef _SYS_MALLOC_H_
#define sn_malloc(x) malloc(x, M_SCTPNAT, M_NOWAIT|M_ZERO)
Modified: trunk/sys/netinet6/mld6.c
===================================================================
--- trunk/sys/netinet6/mld6.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netinet6/mld6.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -194,7 +194,7 @@
* to a vnet in ifp->if_vnet.
*/
static struct mtx mld_mtx;
-MALLOC_DEFINE(M_MLD, "mld", "mld state");
+static MALLOC_DEFINE(M_MLD, "mld", "mld state");
#define MLD_EMBEDSCOPE(pin6, zoneid) \
if (IN6_IS_SCOPE_LINKLOCAL(pin6) || \
Modified: trunk/sys/netinet6/send.c
===================================================================
--- trunk/sys/netinet6/send.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netinet6/send.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -55,7 +55,7 @@
#include <netinet6/scope6_var.h>
#include <netinet6/send.h>
-MALLOC_DEFINE(M_SEND, "send", "Secure Neighbour Discovery");
+static MALLOC_DEFINE(M_SEND, "send", "Secure Neighbour Discovery");
/*
* The socket used to communicate with the SeND daemon.
Modified: trunk/sys/netipx/spx_reass.c
===================================================================
--- trunk/sys/netipx/spx_reass.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/netipx/spx_reass.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -93,7 +93,7 @@
static int spx_use_delack = 0;
static int spxrexmtthresh = 3;
-MALLOC_DEFINE(M_SPXREASSQ, "spxreassq", "SPX reassembly queue entry");
+static MALLOC_DEFINE(M_SPXREASSQ, "spxreassq", "SPX reassembly queue entry");
/*
* Flesh pending queued segments on SPX close.
Modified: trunk/sys/nfs/nfs_lock.c
===================================================================
--- trunk/sys/nfs/nfs_lock.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/nfs/nfs_lock.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -65,8 +65,9 @@
vop_advlock_t *nfs_advlock_p = nfs_dolock;
vop_reclaim_t *nfs_reclaim_p = NULL;
-MALLOC_DEFINE(M_NFSLOCK, "nfsclient_lock", "NFS lock request");
-MALLOC_DEFINE(M_NLMINFO, "nfsclient_nlminfo", "NFS lock process structure");
+static MALLOC_DEFINE(M_NFSLOCK, "nfsclient_lock", "NFS lock request");
+static MALLOC_DEFINE(M_NLMINFO, "nfsclient_nlminfo",
+ "NFS lock process structure");
static int nfslockdans(struct thread *td, struct lockd_ans *ansp);
static void nlminfo_release(struct proc *p);
Modified: trunk/sys/security/mac_bsdextended/mac_bsdextended.c
===================================================================
--- trunk/sys/security/mac_bsdextended/mac_bsdextended.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/security/mac_bsdextended/mac_bsdextended.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -80,7 +80,8 @@
&ugidfw_enabled, 0, "Enforce extended BSD policy");
TUNABLE_INT("security.mac.bsdextended.enabled", &ugidfw_enabled);
-MALLOC_DEFINE(M_MACBSDEXTENDED, "mac_bsdextended", "BSD Extended MAC rule");
+static MALLOC_DEFINE(M_MACBSDEXTENDED, "mac_bsdextended",
+ "BSD Extended MAC rule");
#define MAC_BSDEXTENDED_MAXRULES 250
static struct mac_bsdextended_rule *rules[MAC_BSDEXTENDED_MAXRULES];
Modified: trunk/sys/security/mac_lomac/mac_lomac.c
===================================================================
--- trunk/sys/security/mac_lomac/mac_lomac.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/security/mac_lomac/mac_lomac.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -137,7 +137,7 @@
mac_label_get((l), lomac_slot))
#define PSLOT_SET(l, val) mac_label_set((l), lomac_slot, (uintptr_t)(val))
-MALLOC_DEFINE(M_LOMAC, "mac_lomac_label", "MAC/LOMAC labels");
+static MALLOC_DEFINE(M_LOMAC, "mac_lomac_label", "MAC/LOMAC labels");
static struct mac_lomac *
lomac_alloc(int flag)
Modified: trunk/sys/security/mac_portacl/mac_portacl.c
===================================================================
--- trunk/sys/security/mac_portacl/mac_portacl.c 2016-10-01 09:46:41 UTC (rev 9032)
+++ trunk/sys/security/mac_portacl/mac_portacl.c 2016-10-01 09:52:13 UTC (rev 9033)
@@ -109,7 +109,7 @@
&portacl_port_high, 0, "Highest port to enforce for");
TUNABLE_INT("security.mac.portacl.port_high", &portacl_port_high);
-MALLOC_DEFINE(M_PORTACL, "portacl_rule", "Rules for mac_portacl");
+static MALLOC_DEFINE(M_PORTACL, "portacl_rule", "Rules for mac_portacl");
#define MAC_RULE_STRING_LEN 1024
More information about the Midnightbsd-cvs
mailing list