diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_descrip.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_event.c | 5 | ||||
| -rw-r--r-- | sys/kern/kern_linker.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_mtxpool.c | 3 | ||||
| -rw-r--r-- | sys/kern/subr_witness.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 4ccc37e..ec07d0f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2409,7 +2409,7 @@ filedesc_to_leader_alloc(struct filedesc_to_leader *old, struct filedesc *fdp, s { struct filedesc_to_leader *fdtol; - fdtol = malloc( sizeof(struct filedesc_to_leader), + fdtol = malloc(sizeof(struct filedesc_to_leader), M_FILEDESC_TO_LEADER, M_WAITOK); fdtol->fdl_refcount = 1; diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 6a631be..4acfc49 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -529,8 +529,7 @@ filt_timerattach(struct knote *kn) kn->kn_flags |= EV_CLEAR; /* automatically set */ kn->kn_status &= ~KN_DETACHED; /* knlist_add usually sets it */ - calloutp = malloc(sizeof(*calloutp), - M_KQUEUE, M_WAITOK); + calloutp = malloc(sizeof(*calloutp), M_KQUEUE, M_WAITOK); callout_init(calloutp, CALLOUT_MPSAFE); kn->kn_hook = calloutp; callout_reset_curcpu(calloutp, timertoticks(kn->kn_sdata), @@ -1109,7 +1108,7 @@ kqueue_expand(struct kqueue *kq, struct filterops *fops, uintptr_t ident, size = kq->kq_knlistsize; while (size <= fd) size += KQEXTENT; - list = malloc( size * sizeof list, M_KQUEUE, mflag); + list = malloc(size * sizeof list, M_KQUEUE, mflag); if (list == NULL) return ENOMEM; KQ_LOCK(kq); diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 6cc5d5d..e232cdc 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -1893,8 +1893,8 @@ linker_hwpmc_list_objects(void) retry: /* allocate nmappings+1 entries */ - hc.kobase = malloc( (hc.nmappings + 1) * sizeof(struct pmckern_map_in), M_LINKER, - M_WAITOK | M_ZERO); + hc.kobase = malloc((hc.nmappings + 1) * sizeof(struct pmckern_map_in), + M_LINKER, M_WAITOK | M_ZERO); hc.nobjects = 0; if (linker_file_foreach(linker_hwpmc_list_object, &hc) != 0) { diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c index 6a98fea..23b41bb 100644 --- a/sys/kern/kern_mtxpool.c +++ b/sys/kern/kern_mtxpool.c @@ -146,7 +146,8 @@ mtx_pool_create(const char *mtx_name, int pool_size, int opts) mtx_name); pool_size = 128; } - pool = malloc( sizeof (struct mtx_pool) + ((pool_size - 1) * sizeof (struct mtx)), + pool = malloc(sizeof (struct mtx_pool) + + ((pool_size - 1) * sizeof (struct mtx)), M_MTXPOOL, M_WAITOK | M_ZERO); mtx_pool_initialize(pool, mtx_name, pool_size, opts); return pool; diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 790e90f..ca28c8d 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -708,7 +708,7 @@ witness_initialize(void *dummy __unused) struct witness *w, *w1; int i; - w_data = malloc( sizeof (struct witness) * WITNESS_COUNT, M_WITNESS, + w_data = malloc(sizeof (struct witness) * WITNESS_COUNT, M_WITNESS, M_NOWAIT | M_ZERO); /* |
