diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/acpica/acpi_pci_link.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/ata-all.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/ata-disk.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/ata-dma.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/ata-pci.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/ata-raid.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/atapi-cam.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/atapi-cd.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/atapi-fd.c | 2 | ||||
-rw-r--r-- | sys/dev/ata/atapi-tape.c | 2 | ||||
-rw-r--r-- | sys/dev/md/md.c | 4 | ||||
-rw-r--r-- | sys/dev/tdfx/tdfx_pci.c | 2 | ||||
-rw-r--r-- | sys/dev/twa/tw_osl_freebsd.c | 2 | ||||
-rw-r--r-- | sys/dev/twe/twe_freebsd.c | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 3062281..d7d1f63 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -119,7 +119,7 @@ struct link_res_request { int link_index; }; -MALLOC_DEFINE(M_PCI_LINK, "PCI Link", "ACPI PCI Link structures"); +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; diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 023e41d..41fe0bf 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -73,7 +73,7 @@ static void btrim(int8_t *, int); static void bpack(int8_t *, int8_t *, int); /* global vars */ -MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); +MALLOC_DEFINE(M_ATA, "ata_generic", "ATA driver generic layer"); int (*ata_raid_ioctl_func)(u_long cmd, caddr_t data) = NULL; devclass_t ata_devclass; uma_zone_t ata_request_zone; diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 1a79dc1..a71c0db 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -65,7 +65,7 @@ static disk_ioctl_t ad_ioctl; static dumper_t ad_dump; /* local vars */ -static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver"); +static MALLOC_DEFINE(M_AD, "ad_driver", "ATA disk driver"); static int ad_probe(device_t dev) diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c index 4032a48..2526fcc 100644 --- a/sys/dev/ata/ata-dma.c +++ b/sys/dev/ata/ata-dma.c @@ -54,7 +54,7 @@ static int ata_dmaload(device_t, caddr_t, int32_t, int, void *, int *); static int ata_dmaunload(device_t); /* local vars */ -static MALLOC_DEFINE(M_ATADMA, "ATA DMA", "ATA driver DMA"); +static MALLOC_DEFINE(M_ATADMA, "ata_dma", "ATA driver DMA"); /* misc defines */ #define MAXTABSZ PAGE_SIZE diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 43a0a0a..7eb356d 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include <ata_if.h> /* local vars */ -static MALLOC_DEFINE(M_ATAPCI, "ATA PCI", "ATA driver PCI"); +static MALLOC_DEFINE(M_ATAPCI, "ata_pci", "ATA driver PCI"); /* misc defines */ #define IOMASK 0xfffffffc diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c index d9ac7c0..369ba94 100644 --- a/sys/dev/ata/ata-raid.c +++ b/sys/dev/ata/ata-raid.c @@ -101,7 +101,7 @@ static void ata_raid_via_print_meta(struct via_raid_conf *meta); /* internal vars */ static struct ar_softc *ata_raid_arrays[MAX_ARRAYS]; -static MALLOC_DEFINE(M_AR, "AR driver", "ATA PseudoRAID driver"); +static MALLOC_DEFINE(M_AR, "ar_driver", "ATA PseudoRAID driver"); static devclass_t ata_raid_sub_devclass; static int testing = 0; diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c index 3493837..386de14 100644 --- a/sys/dev/ata/atapi-cam.c +++ b/sys/dev/ata/atapi-cam.c @@ -115,7 +115,7 @@ static struct atapi_hcb *allocate_hcb(struct atapi_xpt_softc *, int, int, union static void free_hcb(struct atapi_hcb *hcb); static void free_softc(struct atapi_xpt_softc *scp); -static MALLOC_DEFINE(M_ATACAM, "ATA CAM transport", "ATA driver CAM-XPT layer"); +static MALLOC_DEFINE(M_ATACAM, "ata_cam", "ATA driver CAM-XPT layer"); static device_method_t atapi_cam_methods[] = { DEVMETHOD(device_identify, atapi_cam_identify), diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index f2618fd..c33b234 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -94,7 +94,7 @@ static int acd_format(device_t, struct cdr_format_params *); static int acd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers"); +static MALLOC_DEFINE(M_ACD, "acd_driver", "ATAPI CD driver buffers"); static struct g_class acd_class = { .name = "ACD", .version = G_VERSION, diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index 00c53ac..c9b3522 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -61,7 +61,7 @@ static int afd_prevent_allow(device_t, int); static int afd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_AFD, "AFD driver", "ATAPI floppy driver buffers"); +static MALLOC_DEFINE(M_AFD, "afd_driver", "ATAPI floppy driver buffers"); static int afd_probe(device_t dev) diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index b06ce47..780f93d 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -85,7 +85,7 @@ static int ast_wait_dsc(device_t, int); /* internal vars */ static u_int64_t ast_total = 0; -static MALLOC_DEFINE(M_AST, "AST driver", "ATAPI tape driver buffers"); +static MALLOC_DEFINE(M_AST, "ast_driver", "ATAPI tape driver buffers"); static int ast_probe(device_t dev) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index ac61775..d811f93 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -94,8 +94,8 @@ #define MD_NSECT (10000 * 2) #endif -static MALLOC_DEFINE(M_MD, "MD disk", "Memory Disk"); -static MALLOC_DEFINE(M_MDSECT, "MD sectors", "Memory Disk Sectors"); +static MALLOC_DEFINE(M_MD, "md_disk", "Memory Disk"); +static MALLOC_DEFINE(M_MDSECT, "md_sectors", "Memory Disk Sectors"); static int md_debug; SYSCTL_INT(_debug, OID_AUTO, mddebug, CTLFLAG_RW, &md_debug, 0, ""); diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c index c0d7125..5d07354 100644 --- a/sys/dev/tdfx/tdfx_pci.c +++ b/sys/dev/tdfx/tdfx_pci.c @@ -96,7 +96,7 @@ static device_method_t tdfx_methods[] = { { 0, 0 } }; -MALLOC_DEFINE(M_TDFX,"TDFX Driver","3DFX Graphics[/2D]/3D Accelerator(s)"); +MALLOC_DEFINE(M_TDFX,"tdfx_driver","3DFX Graphics[/2D]/3D Accelerator(s)"); #ifdef TDFX_LINUX MODULE_DEPEND(tdfx, linux, 1, 1, 1); diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c index 76e790a..154fd89 100644 --- a/sys/dev/twa/tw_osl_freebsd.c +++ b/sys/dev/twa/tw_osl_freebsd.c @@ -52,7 +52,7 @@ TW_INT32 TW_DEBUG_LEVEL_FOR_OSL = TW_OSL_DEBUG; 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"); +MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa_commands", "twa commands"); static d_open_t twa_open; diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index addc7f4..aab15fb 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -866,7 +866,7 @@ twed_detach(device_t dev) /******************************************************************************** * Allocate a command buffer */ -MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe commands", "twe commands"); +MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe_commands", "twe commands"); struct twe_request * twe_allocate_request(struct twe_softc *sc, int tag) |