diff options
| author | marcel <marcel@FreeBSD.org> | 2008-04-19 04:56:16 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2008-04-19 04:56:16 +0000 |
| commit | f4fb7d0eb337734a74993a68edd144165cd1a11d (patch) | |
| tree | f2dd9321172b23dcebcb462139505aba48fd0419 /sys/ia64 | |
| parent | caad0d585aa26dc9b02e19ec714d276d21f598b2 (diff) | |
| download | FreeBSD-src-f4fb7d0eb337734a74993a68edd144165cd1a11d.zip FreeBSD-src-f4fb7d0eb337734a74993a68edd144165cd1a11d.tar.gz | |
Sanitize the malloc types: M_PMAP is not used in pmap.c, so don't
define it there. Don't use M_PMAP in mp_machdep.c; define M_SMP
instead.
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/ia64/mp_machdep.c | 6 | ||||
| -rw-r--r-- | sys/ia64/ia64/pmap.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c index 3589f89..23b86fb 100644 --- a/sys/ia64/ia64/mp_machdep.c +++ b/sys/ia64/ia64/mp_machdep.c @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$"); #include <machine/smp.h> #include <i386/include/specialreg.h> -MALLOC_DECLARE(M_PMAP); +MALLOC_DEFINE(M_SMP, "SMP", "SMP related allocations"); void ia64_ap_startup(void); @@ -209,7 +209,7 @@ cpu_mp_add(u_int acpiid, u_int apicid, u_int apiceid) } if (acpiid != 0) { - pc = (struct pcpu *)malloc(sizeof(*pc), M_PMAP, M_WAITOK); + pc = (struct pcpu *)malloc(sizeof(*pc), M_SMP, M_WAITOK); pcpu_init(pc, acpiid, sizeof(*pc)); } else pc = pcpup; @@ -250,7 +250,7 @@ cpu_mp_start() pc->pc_other_cpus = all_cpus & ~pc->pc_cpumask; if (pc->pc_cpuid > 0) { ap_pcpu = pc; - ap_stack = malloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP, + ap_stack = malloc(KSTACK_PAGES * PAGE_SIZE, M_SMP, M_WAITOK); ap_vhpt = pmap_vhpt_base[pc->pc_cpuid]; ap_delay = 2000; diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index 4c9f280..cac6d47 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -118,8 +118,6 @@ __FBSDID("$FreeBSD$"); /* XXX move to a header. */ extern uint64_t ia64_gateway_page[]; -MALLOC_DEFINE(M_PMAP, "PMAP", "PMAP Structures"); - #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 #endif |
