diff options
| author | phk <phk@FreeBSD.org> | 2003-02-19 22:51:33 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-02-19 22:51:33 +0000 |
| commit | 05d8d6e23fae9150a113e8ab8a8544b981fb7e26 (patch) | |
| tree | 6a84b81914a5a62fe17f47c6567091e10102dbd5 | |
| parent | a8bc02dcb257f24a8246bb1c31abe58bf12ebd04 (diff) | |
| download | FreeBSD-src-05d8d6e23fae9150a113e8ab8a8544b981fb7e26.zip FreeBSD-src-05d8d6e23fae9150a113e8ab8a8544b981fb7e26.tar.gz | |
Add M_WAITOK
| -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 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); |
