Date: Mon, 7 Nov 2011 06:44:48 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r227293 - in head/sys: arm/arm arm/xscale/pxa cam cam/ata cam/scsi cddl/dev/cyclic cddl/dev/fbt compat/linux dev/aac dev/acpi_support dev/acpica dev/acpica/Osd dev/ahci dev/amr dev/ath ... Message-ID: <201111070644.pA76imBO061270@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Mon Nov 7 06:44:47 2011 New Revision: 227293 URL: http://svn.freebsd.org/changeset/base/227293 Log: Mark MALLOC_DEFINEs static that have no corresponding MALLOC_DECLAREs. This means that their use is restricted to a single C file. Modified: head/sys/arm/arm/vm_machdep.c head/sys/arm/xscale/pxa/pxa_smi.c head/sys/arm/xscale/pxa/pxa_space.c head/sys/cam/ata/ata_da.c head/sys/cam/ata/ata_pmp.c head/sys/cam/cam_periph.c head/sys/cam/cam_queue.c head/sys/cam/cam_sim.c head/sys/cam/scsi/scsi_cd.c head/sys/cam/scsi/scsi_ch.c head/sys/cam/scsi/scsi_da.c head/sys/cam/scsi/scsi_low.c head/sys/cam/scsi/scsi_sa.c head/sys/cam/scsi/scsi_ses.c head/sys/cam/scsi/scsi_targ_bh.c head/sys/cddl/dev/cyclic/cyclic.c head/sys/cddl/dev/fbt/fbt.c head/sys/compat/linux/linux_futex.c head/sys/dev/aac/aac.c head/sys/dev/aac/aac_cam.c head/sys/dev/acpi_support/acpi_wmi.c head/sys/dev/acpica/Osd/OsdInterrupt.c head/sys/dev/acpica/Osd/OsdMemory.c head/sys/dev/acpica/Osd/OsdSchedule.c head/sys/dev/acpica/Osd/OsdSynch.c head/sys/dev/acpica/acpi.c head/sys/dev/acpica/acpi_cmbat.c head/sys/dev/acpica/acpi_pci_link.c head/sys/dev/acpica/acpi_perf.c head/sys/dev/acpica/acpi_powerres.c head/sys/dev/acpica/acpi_video.c head/sys/dev/ahci/ahci.c head/sys/dev/amr/amr.c head/sys/dev/amr/amr_cam.c head/sys/dev/ath/ah_osdep.c head/sys/dev/ath/if_ath.c head/sys/dev/ciss/ciss.c head/sys/dev/firewire/fwmem.c head/sys/dev/firewire/if_fwe.c head/sys/dev/firewire/if_fwip.c head/sys/dev/firewire/sbp.c head/sys/dev/firewire/sbp_targ.c head/sys/dev/iicbus/ad7417.c head/sys/dev/iicbus/max6690.c head/sys/dev/iir/iir.c head/sys/dev/ipmi/ipmi.c head/sys/dev/iscsi/initiator/isc_subr.c head/sys/dev/iscsi/initiator/iscsi.c head/sys/dev/malo/if_malo.c head/sys/dev/mps/mps_sas.c head/sys/dev/mvs/mvs.c head/sys/dev/mwl/if_mwl.c head/sys/dev/nmdm/nmdm.c head/sys/dev/puc/puc.c head/sys/dev/quicc/quicc_core.c head/sys/dev/scc/scc_core.c head/sys/dev/siis/siis.c head/sys/dev/sound/pci/envy24.c head/sys/dev/sound/pci/envy24ht.c head/sys/dev/sound/pci/spicds.c head/sys/dev/sound/pcm/ac97.c head/sys/dev/sound/pcm/feeder.c head/sys/dev/sound/pcm/mixer.c head/sys/dev/tdfx/tdfx_pci.c head/sys/dev/twa/tw_osl_freebsd.c head/sys/dev/twe/twe_freebsd.c head/sys/dev/uart/uart_core.c head/sys/dev/xen/balloon/balloon.c head/sys/dev/xen/blkback/blkback.c head/sys/dev/xen/blkfront/blkfront.c head/sys/fs/ntfs/ntfs_subr.c head/sys/fs/smbfs/smbfs_node.c head/sys/fs/udf/udf_vnops.c head/sys/geom/uzip/g_uzip.c head/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c head/sys/ia64/ia64/mca.c head/sys/ia64/ia64/sapic.c head/sys/ia64/ia64/sscdisk.c head/sys/ia64/ia64/unwind.c head/sys/kern/kern_dtrace.c head/sys/kern/kern_fail.c head/sys/kern/kern_jail.c head/sys/kern/kern_lockf.c head/sys/kern/kern_rctl.c head/sys/kern/kern_timeout.c head/sys/kern/subr_pcpu.c head/sys/kern/subr_witness.c head/sys/kern/vfs_mount.c head/sys/libkern/iconv.c head/sys/net/if.c head/sys/net/if_arcsubr.c head/sys/net/if_atmsubr.c head/sys/net/if_ethersubr.c head/sys/net/if_fwsubr.c head/sys/net/if_iso88025subr.c head/sys/net/if_spppsubr.c head/sys/net/vnet.c head/sys/net80211/ieee80211_acl.c head/sys/net80211/ieee80211_dfs.c head/sys/net80211/ieee80211_freebsd.c head/sys/net80211/ieee80211_power.c head/sys/netgraph/atm/ngatmbase.c head/sys/netgraph/atm/uni/ng_uni.c head/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c head/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c head/sys/netgraph/ng_async.c head/sys/netgraph/ng_base.c head/sys/netgraph/ng_bpf.c head/sys/netgraph/ng_bridge.c head/sys/netgraph/ng_deflate.c head/sys/netgraph/ng_gif_demux.c head/sys/netgraph/ng_hub.c head/sys/netgraph/ng_iface.c head/sys/netgraph/ng_ksocket.c head/sys/netgraph/ng_l2tp.c head/sys/netgraph/ng_mppc.c head/sys/netgraph/ng_parse.c head/sys/netgraph/ng_ppp.c head/sys/netgraph/ng_pppoe.c head/sys/netgraph/ng_pred1.c head/sys/netgraph/ng_sample.c head/sys/netgraph/ng_socket.c head/sys/netgraph/ng_sppp.c head/sys/netgraph/ng_tag.c head/sys/netinet/igmp.c head/sys/netinet/ipfw/dn_heap.c head/sys/netinet/ipfw/ip_fw_table.c head/sys/netinet/libalias/alias_sctp.c head/sys/netinet6/mld6.c head/sys/netinet6/send.c head/sys/netipx/spx_reass.c head/sys/netsmb/smb_conn.c head/sys/netsmb/smb_rq.c head/sys/netsmb/smb_subr.c head/sys/nfs/nfs_lock.c head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c head/sys/ofed/include/linux/linux_idr.c head/sys/ofed/include/linux/linux_radix.c head/sys/powerpc/ofw/ofw_real.c head/sys/powerpc/ofw/rtas.c head/sys/powerpc/powermac/dbdma.c head/sys/powerpc/powermac/fcu.c head/sys/powerpc/powermac/powermac_thermal.c head/sys/powerpc/powermac/smu.c head/sys/powerpc/powermac/smusat.c head/sys/powerpc/powerpc/intr_machdep.c head/sys/security/mac_bsdextended/mac_bsdextended.c head/sys/security/mac_lomac/mac_lomac.c head/sys/security/mac_portacl/mac_portacl.c head/sys/sparc64/sparc64/iommu.c head/sys/x86/acpica/acpi_apm.c head/sys/x86/acpica/madt.c Modified: head/sys/arm/arm/vm_machdep.c ============================================================================== --- head/sys/arm/arm/vm_machdep.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/arm/arm/vm_machdep.c Mon Nov 7 06:44:47 2011 (r227293) @@ -526,7 +526,7 @@ extern uma_zone_t l2zone; struct mtx smallalloc_mtx; -MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); +static MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); vm_offset_t alloc_firstaddr; Modified: head/sys/arm/xscale/pxa/pxa_smi.c ============================================================================== --- head/sys/arm/xscale/pxa/pxa_smi.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/arm/xscale/pxa/pxa_smi.c Mon Nov 7 06:44:47 2011 (r227293) @@ -42,7 +42,8 @@ __FBSDID("$FreeBSD$"); #include <arm/xscale/pxa/pxavar.h> #include <arm/xscale/pxa/pxareg.h> -MALLOC_DEFINE(M_PXASMI, "PXA SMI", "Data for static memory interface devices."); +static MALLOC_DEFINE(M_PXASMI, "PXA SMI", + "Data for static memory interface devices."); struct pxa_smi_softc { struct resource *ps_res[1]; Modified: head/sys/arm/xscale/pxa/pxa_space.c ============================================================================== --- head/sys/arm/xscale/pxa/pxa_space.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/arm/xscale/pxa/pxa_space.c Mon Nov 7 06:44:47 2011 (r227293) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <arm/xscale/pxa/pxareg.h> #include <arm/xscale/pxa/pxavar.h> -MALLOC_DEFINE(M_PXATAG, "PXA bus_space tags", "Bus_space tags for PXA"); +static MALLOC_DEFINE(M_PXATAG, "PXA bus_space tags", "Bus_space tags for PXA"); /* Prototypes for all the bus_space structure functions */ bs_protos(generic); Modified: head/sys/cam/ata/ata_da.c ============================================================================== --- head/sys/cam/ata/ata_da.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/ata/ata_da.c Mon Nov 7 06:44:47 2011 (r227293) @@ -378,7 +378,7 @@ static struct periph_driver adadriver = 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: head/sys/cam/ata/ata_pmp.c ============================================================================== --- head/sys/cam/ata/ata_pmp.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/ata/ata_pmp.c Mon Nov 7 06:44:47 2011 (r227293) @@ -147,7 +147,7 @@ static struct periph_driver pmpdriver = 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: head/sys/cam/cam_periph.c ============================================================================== --- head/sys/cam/cam_periph.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/cam_periph.c Mon Nov 7 06:44:47 2011 (r227293) @@ -87,7 +87,7 @@ static int nperiph_drivers; 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: head/sys/cam/cam_queue.c ============================================================================== --- head/sys/cam/cam_queue.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/cam_queue.c Mon Nov 7 06:44:47 2011 (r227293) @@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$"); #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: head/sys/cam/cam_sim.c ============================================================================== --- head/sys/cam/cam_sim.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/cam_sim.c Mon Nov 7 06:44:47 2011 (r227293) @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/cam/scsi/scsi_cd.c ============================================================================== --- head/sys/cam/scsi/scsi_cd.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/scsi/scsi_cd.c Mon Nov 7 06:44:47 2011 (r227293) @@ -336,7 +336,7 @@ static struct mtx changerq_mtx; 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: head/sys/cam/scsi/scsi_ch.c ============================================================================== --- head/sys/cam/scsi/scsi_ch.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/scsi/scsi_ch.c Mon Nov 7 06:44:47 2011 (r227293) @@ -218,7 +218,7 @@ static struct cdevsw ch_cdevsw = { .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: head/sys/cam/scsi/scsi_da.c ============================================================================== --- head/sys/cam/scsi/scsi_da.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/scsi/scsi_da.c Mon Nov 7 06:44:47 2011 (r227293) @@ -642,7 +642,7 @@ static struct periph_driver dadriver = 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: head/sys/cam/scsi/scsi_low.c ============================================================================== --- head/sys/cam/scsi/scsi_low.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/scsi/scsi_low.c Mon Nov 7 06:44:47 2011 (r227293) @@ -145,7 +145,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/cam/scsi/scsi_sa.c ============================================================================== --- head/sys/cam/scsi/scsi_sa.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/scsi/scsi_sa.c Mon Nov 7 06:44:47 2011 (r227293) @@ -102,7 +102,7 @@ __FBSDID("$FreeBSD$"); * 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: head/sys/cam/scsi/scsi_ses.c ============================================================================== --- head/sys/cam/scsi/scsi_ses.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/scsi/scsi_ses.c Mon Nov 7 06:44:47 2011 (r227293) @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <opt_ses.h> -MALLOC_DEFINE(M_SCSISES, "SCSI SES", "SCSI SES buffers"); +static MALLOC_DEFINE(M_SCSISES, "SCSI SES", "SCSI SES buffers"); /* * Platform Independent Driver Internal Definitions for SES devices. Modified: head/sys/cam/scsi/scsi_targ_bh.c ============================================================================== --- head/sys/cam/scsi/scsi_targ_bh.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cam/scsi/scsi_targ_bh.c Mon Nov 7 06:44:47 2011 (r227293) @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/cddl/dev/cyclic/cyclic.c ============================================================================== --- head/sys/cddl/dev/cyclic/cyclic.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cddl/dev/cyclic/cyclic.c Mon Nov 7 06:44:47 2011 (r227293) @@ -339,7 +339,7 @@ static kmem_cache_t *cyclic_id_cache; 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: head/sys/cddl/dev/fbt/fbt.c ============================================================================== --- head/sys/cddl/dev/fbt/fbt.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/cddl/dev/fbt/fbt.c Mon Nov 7 06:44:47 2011 (r227293) @@ -61,7 +61,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: head/sys/compat/linux/linux_futex.c ============================================================================== --- head/sys/compat/linux/linux_futex.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/compat/linux/linux_futex.c Mon Nov 7 06:44:47 2011 (r227293) @@ -65,8 +65,8 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex. #include <compat/linux/linux_futex.h> #include <compat/linux/linux_util.h> -MALLOC_DEFINE(M_FUTEX, "futex", "Linux futexes"); -MALLOC_DEFINE(M_FUTEX_WP, "futex wp", "Linux futexes wp"); +static MALLOC_DEFINE(M_FUTEX, "futex", "Linux futexes"); +static MALLOC_DEFINE(M_FUTEX_WP, "futex wp", "Linux futexes wp"); struct futex; Modified: head/sys/dev/aac/aac.c ============================================================================== --- head/sys/dev/aac/aac.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/aac/aac.c Mon Nov 7 06:44:47 2011 (r227293) @@ -219,7 +219,7 @@ static struct cdevsw aac_cdevsw = { .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 */ SYSCTL_NODE(_hw, OID_AUTO, aac, CTLFLAG_RD, 0, "AAC driver parameters"); Modified: head/sys/dev/aac/aac_cam.c ============================================================================== --- head/sys/dev/aac/aac_cam.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/aac/aac_cam.c Mon Nov 7 06:44:47 2011 (r227293) @@ -104,7 +104,7 @@ static driver_t aac_pass_driver = { 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: head/sys/dev/acpi_support/acpi_wmi.c ============================================================================== --- head/sys/dev/acpi_support/acpi_wmi.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpi_support/acpi_wmi.c Mon Nov 7 06:44:47 2011 (r227293) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/dev/acpica/Osd/OsdInterrupt.c ============================================================================== --- head/sys/dev/acpica/Osd/OsdInterrupt.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/Osd/OsdInterrupt.c Mon Nov 7 06:44:47 2011 (r227293) @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("INTERRUPT") -MALLOC_DEFINE(M_ACPIINTR, "acpiintr", "ACPI interrupt"); +static MALLOC_DEFINE(M_ACPIINTR, "acpiintr", "ACPI interrupt"); struct acpi_intr { SLIST_ENTRY(acpi_intr) ai_link; Modified: head/sys/dev/acpica/Osd/OsdMemory.c ============================================================================== --- head/sys/dev/acpica/Osd/OsdMemory.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/Osd/OsdMemory.c Mon Nov 7 06:44:47 2011 (r227293) @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -MALLOC_DEFINE(M_ACPICA, "acpica", "ACPI CA memory pool"); +static MALLOC_DEFINE(M_ACPICA, "acpica", "ACPI CA memory pool"); void * AcpiOsAllocate(ACPI_SIZE Size) Modified: head/sys/dev/acpica/Osd/OsdSchedule.c ============================================================================== --- head/sys/dev/acpica/Osd/OsdSchedule.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/Osd/OsdSchedule.c Mon Nov 7 06:44:47 2011 (r227293) @@ -65,7 +65,7 @@ TUNABLE_INT("debug.acpi.max_tasks", &acp static int acpi_max_threads = ACPI_MAX_THREADS; TUNABLE_INT("debug.acpi.max_threads", &acpi_max_threads); -MALLOC_DEFINE(M_ACPITASK, "acpitask", "ACPI deferred task"); +static MALLOC_DEFINE(M_ACPITASK, "acpitask", "ACPI deferred task"); struct acpi_task_ctx { struct task at_task; Modified: head/sys/dev/acpica/Osd/OsdSynch.c ============================================================================== --- head/sys/dev/acpica/Osd/OsdSynch.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/Osd/OsdSynch.c Mon Nov 7 06:44:47 2011 (r227293) @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("SYNCH") -MALLOC_DEFINE(M_ACPISEM, "acpisem", "ACPI semaphore"); +static MALLOC_DEFINE(M_ACPISEM, "acpisem", "ACPI semaphore"); /* * Convert milliseconds to ticks. Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/acpi.c Mon Nov 7 06:44:47 2011 (r227293) @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> -MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices"); +static MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices"); /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_BUS Modified: head/sys/dev/acpica/acpi_cmbat.c ============================================================================== --- head/sys/dev/acpica/acpi_cmbat.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/acpi_cmbat.c Mon Nov 7 06:44:47 2011 (r227293) @@ -46,7 +46,8 @@ __FBSDID("$FreeBSD$"); #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> -MALLOC_DEFINE(M_ACPICMBAT, "acpicmbat", "ACPI control method battery data"); +static MALLOC_DEFINE(M_ACPICMBAT, "acpicmbat", + "ACPI control method battery data"); /* Number of times to retry initialization before giving up. */ #define ACPI_CMBAT_RETRY_MAX 6 Modified: head/sys/dev/acpica/acpi_pci_link.c ============================================================================== --- head/sys/dev/acpica/acpi_pci_link.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/acpi_pci_link.c Mon Nov 7 06:44:47 2011 (r227293) @@ -120,7 +120,7 @@ struct link_res_request { int link_index; }; -MALLOC_DEFINE(M_PCI_LINK, "pci_link", "ACPI PCI Link structures"); +static MALLOC_DEFINE(M_PCI_LINK, "pci_link", "ACPI PCI Link structures"); static int pci_link_interrupt_weights[NUM_ACPI_INTERRUPTS]; static int pci_link_bios_isa_irqs; Modified: head/sys/dev/acpica/acpi_perf.c ============================================================================== --- head/sys/dev/acpica/acpi_perf.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/acpi_perf.c Mon Nov 7 06:44:47 2011 (r227293) @@ -135,7 +135,7 @@ static devclass_t acpi_perf_devclass; DRIVER_MODULE(acpi_perf, cpu, acpi_perf_driver, acpi_perf_devclass, 0, 0); MODULE_DEPEND(acpi_perf, acpi, 1, 1, 1); -MALLOC_DEFINE(M_ACPIPERF, "acpi_perf", "ACPI Performance states"); +static MALLOC_DEFINE(M_ACPIPERF, "acpi_perf", "ACPI Performance states"); static void acpi_perf_identify(driver_t *driver, device_t parent) Modified: head/sys/dev/acpica/acpi_powerres.c ============================================================================== --- head/sys/dev/acpica/acpi_powerres.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/acpi_powerres.c Mon Nov 7 06:44:47 2011 (r227293) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); * on, turned off, etc. */ -MALLOC_DEFINE(M_ACPIPWR, "acpipwr", "ACPI power resources"); +static MALLOC_DEFINE(M_ACPIPWR, "acpipwr", "ACPI power resources"); /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_POWERRES Modified: head/sys/dev/acpica/acpi_video.c ============================================================================== --- head/sys/dev/acpica/acpi_video.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/acpica/acpi_video.c Mon Nov 7 06:44:47 2011 (r227293) @@ -183,7 +183,7 @@ static struct acpi_video_output_queue cr */ ACPI_SERIAL_DECL(video, "ACPI video"); ACPI_SERIAL_DECL(video_output, "ACPI video output"); -MALLOC_DEFINE(M_ACPIVIDEO, "acpivideo", "ACPI video extension"); +static MALLOC_DEFINE(M_ACPIVIDEO, "acpivideo", "ACPI video extension"); static int acpi_video_modevent(struct module *mod __unused, int evt, void *cookie __unused) Modified: head/sys/dev/ahci/ahci.c ============================================================================== --- head/sys/dev/ahci/ahci.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/ahci/ahci.c Mon Nov 7 06:44:47 2011 (r227293) @@ -101,7 +101,7 @@ static void ahci_process_request_sense(d static void ahciaction(struct cam_sim *sim, union ccb *ccb); static void ahcipoll(struct cam_sim *sim); -MALLOC_DEFINE(M_AHCI, "AHCI driver", "AHCI driver data buffers"); +static MALLOC_DEFINE(M_AHCI, "AHCI driver", "AHCI driver data buffers"); static struct { uint32_t id; Modified: head/sys/dev/amr/amr.c ============================================================================== --- head/sys/dev/amr/amr.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/amr/amr.c Mon Nov 7 06:44:47 2011 (r227293) @@ -175,7 +175,7 @@ static void amr_init_sysctl(struct amr_s 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: head/sys/dev/amr/amr_cam.c ============================================================================== --- head/sys/dev/amr/amr_cam.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/amr/amr_cam.c Mon Nov 7 06:44:47 2011 (r227293) @@ -109,7 +109,7 @@ static driver_t amr_pass_driver = { 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: head/sys/dev/ath/ah_osdep.c ============================================================================== --- head/sys/dev/ath/ah_osdep.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/ath/ah_osdep.c Mon Nov 7 06:44:47 2011 (r227293) @@ -85,7 +85,7 @@ SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug, TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug); #endif /* AH_DEBUG */ -MALLOC_DEFINE(M_ATH_HAL, "ath_hal", "ath hal data"); +static MALLOC_DEFINE(M_ATH_HAL, "ath_hal", "ath hal data"); void* ath_hal_malloc(size_t size) Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/ath/if_ath.c Mon Nov 7 06:44:47 2011 (r227293) @@ -263,7 +263,7 @@ static int ath_bstuck_threshold = 4; /* SYSCTL_INT(_hw_ath, OID_AUTO, bstuck, CTLFLAG_RW, &ath_bstuck_threshold, 0, "max missed beacon xmits before chip reset"); -MALLOC_DEFINE(M_ATHDEV, "athdev", "ath driver dma buffers"); +static MALLOC_DEFINE(M_ATHDEV, "athdev", "ath driver dma buffers"); #define HAL_MODE_HT20 (HAL_MODE_11NG_HT20 | HAL_MODE_11NA_HT20) #define HAL_MODE_HT40 \ Modified: head/sys/dev/ciss/ciss.c ============================================================================== --- head/sys/dev/ciss/ciss.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/ciss/ciss.c Mon Nov 7 06:44:47 2011 (r227293) @@ -105,7 +105,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: head/sys/dev/firewire/fwmem.c ============================================================================== --- head/sys/dev/firewire/fwmem.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/firewire/fwmem.c Mon Nov 7 06:44:47 2011 (r227293) @@ -84,7 +84,7 @@ SYSCTL_INT(_hw_firewire_fwmem, OID_AUTO, 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: head/sys/dev/firewire/if_fwe.c ============================================================================== --- head/sys/dev/firewire/if_fwe.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/firewire/if_fwe.c Mon Nov 7 06:44:47 2011 (r227293) @@ -86,7 +86,7 @@ static int stream_ch = 1; 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); SYSCTL_NODE(_hw_firewire, OID_AUTO, fwe, CTLFLAG_RD, 0, Modified: head/sys/dev/firewire/if_fwip.c ============================================================================== --- head/sys/dev/firewire/if_fwip.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/firewire/if_fwip.c Mon Nov 7 06:44:47 2011 (r227293) @@ -99,7 +99,7 @@ static int broadcast_channel = 0xc0 | 0x 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); SYSCTL_NODE(_hw_firewire, OID_AUTO, fwip, CTLFLAG_RD, 0, Modified: head/sys/dev/firewire/sbp.c ============================================================================== --- head/sys/dev/firewire/sbp.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/firewire/sbp.c Mon Nov 7 06:44:47 2011 (r227293) @@ -276,7 +276,7 @@ static void sbp_mgm_timeout (void *arg); 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: head/sys/dev/firewire/sbp_targ.c ============================================================================== --- head/sys/dev/firewire/sbp_targ.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/firewire/sbp_targ.c Mon Nov 7 06:44:47 2011 (r227293) @@ -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: head/sys/dev/iicbus/ad7417.c ============================================================================== --- head/sys/dev/iicbus/ad7417.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/iicbus/ad7417.c Mon Nov 7 06:44:47 2011 (r227293) @@ -121,7 +121,7 @@ static driver_t ad7417_driver = { 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: head/sys/dev/iicbus/max6690.c ============================================================================== --- head/sys/dev/iicbus/max6690.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/iicbus/max6690.c Mon Nov 7 06:44:47 2011 (r227293) @@ -101,7 +101,7 @@ static driver_t max6690_driver = { 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: head/sys/dev/iir/iir.c ============================================================================== --- head/sys/dev/iir/iir.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/iir/iir.c Mon Nov 7 06:44:47 2011 (r227293) @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/dev/ipmi/ipmi.c ============================================================================== --- head/sys/dev/ipmi/ipmi.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/ipmi/ipmi.c Mon Nov 7 06:44:47 2011 (r227293) @@ -75,7 +75,7 @@ static struct cdevsw ipmi_cdevsw = { .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: head/sys/dev/iscsi/initiator/isc_subr.c ============================================================================== --- head/sys/dev/iscsi/initiator/isc_subr.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/iscsi/initiator/isc_subr.c Mon Nov 7 06:44:47 2011 (r227293) @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/dev/iscsi/initiator/iscsi.c ============================================================================== --- head/sys/dev/iscsi/initiator/iscsi.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/iscsi/initiator/iscsi.c Mon Nov 7 06:44:47 2011 (r227293) @@ -66,7 +66,7 @@ static struct isc_softc *isc; 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: head/sys/dev/malo/if_malo.c ============================================================================== --- head/sys/dev/malo/if_malo.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/malo/if_malo.c Mon Nov 7 06:44:47 2011 (r227293) @@ -123,7 +123,7 @@ enum { } 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 *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, Modified: head/sys/dev/mps/mps_sas.c ============================================================================== --- head/sys/dev/mps/mps_sas.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/mps/mps_sas.c Mon Nov 7 06:44:47 2011 (r227293) @@ -119,7 +119,7 @@ struct mpssas_devprobe { #define MPSSAS_DISCOVERY_TIMEOUT 20 #define MPSSAS_MAX_DISCOVERY_TIMEOUTS 10 /* 200 seconds */ -MALLOC_DEFINE(M_MPSSAS, "MPSSAS", "MPS SAS memory"); +static MALLOC_DEFINE(M_MPSSAS, "MPSSAS", "MPS SAS memory"); static __inline int mpssas_set_lun(uint8_t *lun, u_int ccblun); static struct mpssas_target * mpssas_alloc_target(struct mpssas_softc *, Modified: head/sys/dev/mvs/mvs.c ============================================================================== --- head/sys/dev/mvs/mvs.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/mvs/mvs.c Mon Nov 7 06:44:47 2011 (r227293) @@ -94,7 +94,7 @@ static void mvs_process_request_sense(de 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: head/sys/dev/mwl/if_mwl.c ============================================================================== --- head/sys/dev/mwl/if_mwl.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/mwl/if_mwl.c Mon Nov 7 06:44:47 2011 (r227293) @@ -262,7 +262,7 @@ static void mwl_printtxbuf(const struct } 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: head/sys/dev/nmdm/nmdm.c ============================================================================== --- head/sys/dev/nmdm/nmdm.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/nmdm/nmdm.c Mon Nov 7 06:44:47 2011 (r227293) @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/dev/puc/puc.c ============================================================================== --- head/sys/dev/puc/puc.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/puc/puc.c Mon Nov 7 06:44:47 2011 (r227293) @@ -68,7 +68,7 @@ struct puc_port { 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: head/sys/dev/quicc/quicc_core.c ============================================================================== --- head/sys/dev/quicc/quicc_core.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/quicc/quicc_core.c Mon Nov 7 06:44:47 2011 (r227293) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); 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: head/sys/dev/scc/scc_core.c ============================================================================== --- head/sys/dev/scc/scc_core.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/scc/scc_core.c Mon Nov 7 06:44:47 2011 (r227293) @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); 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: head/sys/dev/siis/siis.c ============================================================================== --- head/sys/dev/siis/siis.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/siis/siis.c Mon Nov 7 06:44:47 2011 (r227293) @@ -91,7 +91,7 @@ static void siis_process_request_sense(d 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: head/sys/dev/sound/pci/envy24.c ============================================================================== --- head/sys/dev/sound/pci/envy24.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/sound/pci/envy24.c Mon Nov 7 06:44:47 2011 (r227293) @@ -41,7 +41,7 @@ SND_DECLARE_FILE("$FreeBSD$"); -MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); +static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); /* -------------------------------------------------------------------- */ Modified: head/sys/dev/sound/pci/envy24ht.c ============================================================================== --- head/sys/dev/sound/pci/envy24ht.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/sound/pci/envy24ht.c Mon Nov 7 06:44:47 2011 (r227293) @@ -53,7 +53,7 @@ SND_DECLARE_FILE("$FreeBSD$"); -MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); +static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); /* -------------------------------------------------------------------- */ Modified: head/sys/dev/sound/pci/spicds.c ============================================================================== --- head/sys/dev/sound/pci/spicds.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/sound/pci/spicds.c Mon Nov 7 06:44:47 2011 (r227293) @@ -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: head/sys/dev/sound/pcm/ac97.c ============================================================================== --- head/sys/dev/sound/pcm/ac97.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/sound/pcm/ac97.c Mon Nov 7 06:44:47 2011 (r227293) @@ -38,7 +38,7 @@ SND_DECLARE_FILE("$FreeBSD$"); -MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); +static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); struct ac97mixtable_entry { int reg; /* register index */ Modified: head/sys/dev/sound/pcm/feeder.c ============================================================================== --- head/sys/dev/sound/pcm/feeder.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/sound/pcm/feeder.c Mon Nov 7 06:44:47 2011 (r227293) @@ -35,7 +35,7 @@ SND_DECLARE_FILE("$FreeBSD$"); -MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); +static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); #define MAXFEEDERS 256 #undef FEEDER_DEBUG Modified: head/sys/dev/sound/pcm/mixer.c ============================================================================== --- head/sys/dev/sound/pcm/mixer.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/sound/pcm/mixer.c Mon Nov 7 06:44:47 2011 (r227293) @@ -37,7 +37,7 @@ SND_DECLARE_FILE("$FreeBSD$"); -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: head/sys/dev/tdfx/tdfx_pci.c ============================================================================== --- head/sys/dev/tdfx/tdfx_pci.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/tdfx/tdfx_pci.c Mon Nov 7 06:44:47 2011 (r227293) @@ -89,7 +89,7 @@ static device_method_t tdfx_methods[] = { 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: head/sys/dev/twa/tw_osl_freebsd.c ============================================================================== --- head/sys/dev/twa/tw_osl_freebsd.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/twa/tw_osl_freebsd.c Mon Nov 7 06:44:47 2011 (r227293) @@ -54,7 +54,7 @@ TW_INT32 TW_DEBUG_LEVEL_FOR_OSL = TW_OSL 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: head/sys/dev/twe/twe_freebsd.c ============================================================================== --- head/sys/dev/twe/twe_freebsd.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/twe/twe_freebsd.c Mon Nov 7 06:44:47 2011 (r227293) @@ -872,7 +872,7 @@ twed_detach(device_t dev) /******************************************************************************** * 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: head/sys/dev/uart/uart_core.c ============================================================================== --- head/sys/dev/uart/uart_core.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/uart/uart_core.c Mon Nov 7 06:44:47 2011 (r227293) @@ -56,7 +56,7 @@ char uart_driver_name[] = "uart"; 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: head/sys/dev/xen/balloon/balloon.c ============================================================================== --- head/sys/dev/xen/balloon/balloon.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/xen/balloon/balloon.c Mon Nov 7 06:44:47 2011 (r227293) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/dev/xen/blkback/blkback.c ============================================================================== --- head/sys/dev/xen/blkback/blkback.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/xen/blkback/blkback.c Mon Nov 7 06:44:47 2011 (r227293) @@ -121,7 +121,7 @@ __FBSDID("$FreeBSD$"); /** * 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: head/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- head/sys/dev/xen/blkfront/blkfront.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/dev/xen/blkfront/blkfront.c Mon Nov 7 06:44:47 2011 (r227293) @@ -81,7 +81,7 @@ static int blkif_completion(struct xb_co 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: head/sys/fs/ntfs/ntfs_subr.c ============================================================================== --- head/sys/fs/ntfs/ntfs_subr.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/fs/ntfs/ntfs_subr.c Mon Nov 7 06:44:47 2011 (r227293) @@ -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: head/sys/fs/smbfs/smbfs_node.c ============================================================================== --- head/sys/fs/smbfs/smbfs_node.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/fs/smbfs/smbfs_node.c Mon Nov 7 06:44:47 2011 (r227293) @@ -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: head/sys/fs/udf/udf_vnops.c ============================================================================== --- head/sys/fs/udf/udf_vnops.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/fs/udf/udf_vnops.c Mon Nov 7 06:44:47 2011 (r227293) @@ -107,8 +107,8 @@ struct vop_vector udf_fifoops = { .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: head/sys/geom/uzip/g_uzip.c ============================================================================== --- head/sys/geom/uzip/g_uzip.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/geom/uzip/g_uzip.c Mon Nov 7 06:44:47 2011 (r227293) @@ -50,7 +50,7 @@ FEATURE(geom_uzip, "GEOM uzip read-only #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: head/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c ============================================================================== --- head/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c Mon Nov 7 06:44:47 2011 (r227293) @@ -71,7 +71,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: head/sys/ia64/ia64/mca.c ============================================================================== --- head/sys/ia64/ia64/mca.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/ia64/ia64/mca.c Mon Nov 7 06:44:47 2011 (r227293) @@ -43,7 +43,7 @@ #include <machine/sal.h> #include <machine/smp.h> -MALLOC_DEFINE(M_MCA, "MCA", "Machine Check Architecture"); +static MALLOC_DEFINE(M_MCA, "MCA", "Machine Check Architecture"); struct mca_info { STAILQ_ENTRY(mca_info) mi_link; Modified: head/sys/ia64/ia64/sapic.c ============================================================================== --- head/sys/ia64/ia64/sapic.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/ia64/ia64/sapic.c Mon Nov 7 06:44:47 2011 (r227293) @@ -99,7 +99,7 @@ struct sapic_rte { uint64_t rte_destination_id :8; }; -MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices"); +static MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices"); struct sapic *ia64_sapics[16]; /* XXX make this resizable */ int ia64_sapic_count; Modified: head/sys/ia64/ia64/sscdisk.c ============================================================================== --- head/sys/ia64/ia64/sscdisk.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/ia64/ia64/sscdisk.c Mon Nov 7 06:44:47 2011 (r227293) @@ -72,7 +72,7 @@ ssc(u_int64_t in0, u_int64_t in1, u_int6 #define SSC_NSECT 409600 #endif -MALLOC_DEFINE(M_SSC, "ssc_disk", "Simulator Disk"); +static MALLOC_DEFINE(M_SSC, "ssc_disk", "Simulator Disk"); static d_strategy_t sscstrategy; Modified: head/sys/ia64/ia64/unwind.c ============================================================================== --- head/sys/ia64/ia64/unwind.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/ia64/ia64/unwind.c Mon Nov 7 06:44:47 2011 (r227293) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <uwx.h> -MALLOC_DEFINE(M_UNWIND, "Unwind", "Unwind information"); +static MALLOC_DEFINE(M_UNWIND, "Unwind", "Unwind information"); struct unw_entry { uint64_t ue_start; /* procedure start */ Modified: head/sys/kern/kern_dtrace.c ============================================================================== --- head/sys/kern/kern_dtrace.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/kern_dtrace.c Mon Nov 7 06:44:47 2011 (r227293) @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); 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: head/sys/kern/kern_fail.c ============================================================================== --- head/sys/kern/kern_fail.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/kern_fail.c Mon Nov 7 06:44:47 2011 (r227293) @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); 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: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/kern_jail.c Mon Nov 7 06:44:47 2011 (r227293) @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/kern/kern_lockf.c ============================================================================== --- head/sys/kern/kern_lockf.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/kern_lockf.c Mon Nov 7 06:44:47 2011 (r227293) @@ -90,7 +90,7 @@ static int lockf_debug = 0; /* control d 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: head/sys/kern/kern_rctl.c ============================================================================== --- head/sys/kern/kern_rctl.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/kern_rctl.c Mon Nov 7 06:44:47 2011 (r227293) @@ -169,7 +169,7 @@ RW_SYSINIT(rctl_lock, &rctl_lock, "RCTL 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: head/sys/kern/kern_timeout.c ============================================================================== --- head/sys/kern/kern_timeout.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/kern_timeout.c Mon Nov 7 06:44:47 2011 (r227293) @@ -156,7 +156,7 @@ struct callout_cpu cc_cpu; 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: head/sys/kern/subr_pcpu.c ============================================================================== --- head/sys/kern/subr_pcpu.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/subr_pcpu.c Mon Nov 7 06:44:47 2011 (r227293) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/kern/subr_witness.c ============================================================================== --- head/sys/kern/subr_witness.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/subr_witness.c Mon Nov 7 06:44:47 2011 (r227293) @@ -184,7 +184,7 @@ __FBSDID("$FreeBSD$"); #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: head/sys/kern/vfs_mount.c ============================================================================== --- head/sys/kern/vfs_mount.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/kern/vfs_mount.c Mon Nov 7 06:44:47 2011 (r227293) @@ -79,7 +79,7 @@ SYSCTL_INT(_vfs, OID_AUTO, usermount, CT "Unprivileged users may mount and unmount file systems"); MALLOC_DEFINE(M_MOUNT, "mount", "vfs mount structure"); -MALLOC_DEFINE(M_VNODE_MARKER, "vnodemarker", "vnode marker"); +static MALLOC_DEFINE(M_VNODE_MARKER, "vnodemarker", "vnode marker"); static uma_zone_t mount_zone; /* List of mounted filesystems. */ Modified: head/sys/libkern/iconv.c ============================================================================== --- head/sys/libkern/iconv.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/libkern/iconv.c Mon Nov 7 06:44:47 2011 (r227293) @@ -43,7 +43,7 @@ SYSCTL_DECL(_kern_iconv); 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: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Mon Nov 7 06:24:35 2011 (r227292) +++ head/sys/net/if.c Mon Nov 7 06:44:47 2011 (r227293) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111070644.pA76imBO061270>