diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-02-19 22:51:33 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-02-19 22:51:33 +0000 |
| commit | 0c977c9c53916de8a0f52bac1e50a6d89e22801d (patch) | |
| tree | 6a84b81914a5a62fe17f47c6567091e10102dbd5 | |
| parent | 340c35de6a249d9dd8b4f72f7c75c851a158db09 (diff) | |
Notes
| -rw-r--r-- | sys/geom/geom_stats.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_conf.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/geom/geom_stats.c b/sys/geom/geom_stats.c index 3b66d27ff367..caf07803e263 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 302a8bba0693..9e4e92a9710c 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); |