d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r364310.

Browse Source 
Some of the resulting fallout in CAM does not appear straightforward to
fix, so simply revert the commit for now in the absence of a better
solution.

Discussed with:	mjg
Reported by:	dhw
This commit is contained in:
Mark Johnston 2020-08-18 14:09:49 +00:00
parent eda20682cb
commit b21b022a81
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/kern/kern_malloc.c
View File

@ -618,9 +618,6 @@ void *
unsigned long osize = size; unsigned long osize = size;
#endif #endif
KASSERT((flags & M_WAITOK) == 0 || THREAD_CAN_SLEEP(),
("malloc(M_WAITOK) in non-sleepable context"));
#ifdef MALLOC_DEBUG #ifdef MALLOC_DEBUG
va = NULL; va = NULL;
if (malloc_dbg(&va, &size, mtp, flags) != 0) if (malloc_dbg(&va, &size, mtp, flags) != 0)

6
sys/vm/uma_core.c
View File

@ -3328,9 +3328,6 @@ uma_zalloc_smr(uma_zone_t zone, int flags)
uma_cache_bucket_t bucket; uma_cache_bucket_t bucket;
uma_cache_t cache; uma_cache_t cache;
KASSERT((flags & M_WAITOK) == 0 || THREAD_CAN_SLEEP(),
("uma_zalloc_smr(M_WAITOK) in non-sleepable context"));
#ifdef UMA_ZALLOC_DEBUG #ifdef UMA_ZALLOC_DEBUG
void *item; void *item;
@ -3355,9 +3352,6 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
uma_cache_bucket_t bucket; uma_cache_bucket_t bucket;
uma_cache_t cache; uma_cache_t cache;
KASSERT((flags & M_WAITOK) == 0 || THREAD_CAN_SLEEP(),
("uma_zalloc(M_WAITOK) in non-sleepable context"));
/* Enable entropy collection for RANDOM_ENABLE_UMA kernel option */ /* Enable entropy collection for RANDOM_ENABLE_UMA kernel option */
random_harvest_fast_uma(&zone, sizeof(zone), RANDOM_UMA); random_harvest_fast_uma(&zone, sizeof(zone), RANDOM_UMA);