summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/geom/geom_stats.c4
-rw-r--r--sys/kern/kern_conf.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/geom/geom_stats.c b/sys/geom/geom_stats.c
index 3b66d27..caf0780 100644
--- a/sys/geom/geom_stats.c
+++ b/sys/geom/geom_stats.c
@@ -73,9 +73,9 @@ g_stat_new(void *id)
break;
}
if (spp == NULL) {
- spp = g_malloc(sizeof *spp, M_ZERO);
+ spp = g_malloc(sizeof *spp, M_ZERO | M_WAITOK);
TAILQ_INSERT_TAIL(&pagelist, spp, list);
- spp->stat = g_malloc(PAGE_SIZE, M_ZERO);
+ spp->stat = g_malloc(PAGE_SIZE, M_ZERO | M_WAITOK);
spp->nfree = statsperpage;
}
gsp = spp->stat;
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 302a8bb..9e4e92a 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -149,7 +149,7 @@ allocdev(void)
LIST_REMOVE(si, si_hash);
} else if (stashed >= DEVT_STASH) {
MALLOC(si, struct cdev *, sizeof(*si), M_DEVT,
- M_USE_RESERVE | M_ZERO);
+ M_USE_RESERVE | M_ZERO | M_WAITOK);
} else {
si = devt_stash + stashed++;
bzero(si, sizeof *si);
OpenPOWER on IntegriCloud