Index: kernel/generic/src/adt/cht.c
===================================================================
--- kernel/generic/src/adt/cht.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ kernel/generic/src/adt/cht.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -573,5 +573,5 @@
 	size_t bytes =
 	    sizeof(cht_buckets_t) + (bucket_cnt - 1) * sizeof(marked_ptr_t);
-	cht_buckets_t *b = malloc(bytes, can_block ? 0 : FRAME_ATOMIC);
+	cht_buckets_t *b = can_block ? nfmalloc(bytes) : malloc(bytes);
 
 	if (!b)
Index: kernel/generic/src/adt/hash_table.c
===================================================================
--- kernel/generic/src/adt/hash_table.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ kernel/generic/src/adt/hash_table.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -401,5 +401,5 @@
 	assert(pbuckets && HT_MIN_BUCKETS <= bucket_cnt);
 
-	list_t *buckets = malloc(bucket_cnt * sizeof(list_t), FRAME_ATOMIC);
+	list_t *buckets = malloc(bucket_cnt * sizeof(list_t));
 	if (!buckets)
 		return false;