From c3f2ee9700d0fed2b3e547667a6c907d938f10ed Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 8 Dec 2000 20:09:00 +0000 Subject: Staticize some malloc M_ instances. --- sys/dev/agp/agp.c | 2 +- sys/dev/ata/ata-all.c | 2 +- sys/dev/ata/ata-disk.c | 2 +- sys/dev/ata/ata-raid.c | 2 +- sys/dev/ata/atapi-all.c | 2 +- sys/dev/ata/atapi-cd.c | 2 +- sys/dev/ata/atapi-fd.c | 2 +- sys/dev/ata/atapi-tape.c | 2 +- sys/dev/atkbdc/atkbdc_isa.c | 2 +- sys/dev/atkbdc/atkbdc_subr.c | 2 +- sys/dev/ppbus/ppbconf.c | 2 +- sys/dev/snp/snp.c | 2 +- sys/dev/speaker/spkr.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 99df8cc..ce1c4c9 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -58,7 +58,7 @@ MODULE_VERSION(agp, 1); -MALLOC_DEFINE(M_AGP, "agp", "AGP data structures"); +static MALLOC_DEFINE(M_AGP, "agp", "AGP data structures"); #define CDEV_MAJOR 148 /* agp_drv.c */ diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 47b6b4e..1d147f5 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -96,7 +96,7 @@ static devclass_t ata_devclass; static devclass_t ata_pci_devclass; static struct intr_config_hook *ata_delayed_attach = NULL; static char ata_conf[256]; -MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); +static MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); #if NISA > 0 static struct isa_pnp_id ata_ids[] = { diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 04fb26f..799e9ad 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -80,7 +80,7 @@ static int ad_version(u_int16_t); /* internal vars */ static u_int32_t adp_lun_map = 0; -MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver"); +static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver"); /* defines */ #define AD_MAX_RETRIES 3 diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c index 2a8b921..bc9cbe4 100644 --- a/sys/dev/ata/ata-raid.c +++ b/sys/dev/ata/ata-raid.c @@ -76,7 +76,7 @@ static int ar_read(struct ad_softc *, u_int32_t, int, char *); /* internal vars */ static int ar_init = 0; static struct ar_softc *ar_table[8]; -MALLOC_DEFINE(M_AR, "AR driver", "ATA RAID driver"); +static MALLOC_DEFINE(M_AR, "AR driver", "ATA RAID driver"); /* defines */ #define PRINT_AD(adp) \ diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c index 2ea1e5c..d15d893 100644 --- a/sys/dev/ata/atapi-all.c +++ b/sys/dev/ata/atapi-all.c @@ -51,7 +51,7 @@ static char *atapi_cmd2str(u_int8_t); static char *atapi_skey2str(u_int8_t); /* internal vars */ -MALLOC_DEFINE(M_ATAPI, "ATAPI generic", "ATAPI driver generic layer"); +static MALLOC_DEFINE(M_ATAPI, "ATAPI generic", "ATAPI driver generic layer"); /* defines */ #define ATAPI_MAX_RETRIES 3 diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index c3509cf..f32c5b7 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -98,7 +98,7 @@ static int acd_set_speed(struct acd_softc *cdp, int); /* internal vars */ static u_int32_t acd_lun_map = 0; -MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers"); +static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers"); int acdattach(struct atapi_softc *atp) diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index 62f844d..84398a0 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -76,7 +76,7 @@ static int afd_prevent_allow(struct afd_softc *, int); /* internal vars */ static u_int32_t afd_lun_map = 0; -MALLOC_DEFINE(M_AFD, "AFD driver", "ATAPI floppy driver buffers"); +static MALLOC_DEFINE(M_AFD, "AFD driver", "ATAPI floppy driver buffers"); int afdattach(struct atapi_softc *atp) diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index ac1049c..e590958 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -82,7 +82,7 @@ static int ast_erase(struct ast_softc *); /* internal vars */ static u_int32_t ast_lun_map = 0; static u_int64_t ast_total = 0; -MALLOC_DEFINE(M_AST, "AST driver", "ATAPI tape driver buffers"); +static MALLOC_DEFINE(M_AST, "AST driver", "ATAPI tape driver buffers"); int astattach(struct atapi_softc *atp) diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index d2a4021..e8c3e4c 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -43,7 +43,7 @@ #include #include -MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device"); +static MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device"); /* children */ typedef struct atkbdc_device { diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index d2a4021..e8c3e4c 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.c @@ -43,7 +43,7 @@ #include #include -MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device"); +static MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device"); /* children */ typedef struct atkbdc_device { diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c index 15d02ed..6f6bf95 100644 --- a/sys/dev/ppbus/ppbconf.c +++ b/sys/dev/ppbus/ppbconf.c @@ -42,7 +42,7 @@ #define DEVTOSOFTC(dev) ((struct ppb_data *)device_get_softc(dev)) -MALLOC_DEFINE(M_PPBUSDEV, "ppbusdev", "Parallel Port bus device"); +static MALLOC_DEFINE(M_PPBUSDEV, "ppbusdev", "Parallel Port bus device"); /* diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 648a6a5..9950513 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -61,7 +61,7 @@ static struct cdevsw snp_cdevsw = { #define MIN(a,b) (((a)<(b))?(a):(b)) #endif -MALLOC_DEFINE(M_SNP, "snp", "Snoop device data"); +static MALLOC_DEFINE(M_SNP, "snp", "Snoop device data"); static struct tty *snpdevtotty __P((dev_t dev)); static int snp_detach __P((struct snoop *snp)); diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index e6f0e95..776a9c6 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -45,7 +45,7 @@ static struct cdevsw spkr_cdevsw = { /* bmaj */ -1 }; -MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer"); +static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer"); /**************** MACHINE DEPENDENT PART STARTS HERE ************************* * -- cgit v1.1