Index: kernel/generic/src/lib/gsort.c
===================================================================
--- kernel/generic/src/lib/gsort.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/generic/src/lib/gsort.c	(revision ad896ebba1de338128a963fdca9134a0b48dc7c6)
@@ -111,5 +111,5 @@
 
 	if (elem_size > IBUF_SIZE) {
-		slot = (void *) malloc(elem_size, FRAME_ATOMIC);
+		slot = (void *) malloc(elem_size);
 		if (!slot)
 			return false;
Index: kernel/generic/src/lib/ra.c
===================================================================
--- kernel/generic/src/lib/ra.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/generic/src/lib/ra.c	(revision ad896ebba1de338128a963fdca9134a0b48dc7c6)
@@ -124,5 +124,5 @@
 	unsigned int i;
 
-	span = (ra_span_t *) malloc(sizeof(ra_span_t), FRAME_ATOMIC);
+	span = (ra_span_t *) malloc(sizeof(ra_span_t));
 	if (!span)
 		return NULL;
@@ -132,6 +132,5 @@
 	span->size = size;
 
-	span->free = (list_t *) malloc((span->max_order + 1) * sizeof(list_t),
-	    FRAME_ATOMIC);
+	span->free = (list_t *) malloc((span->max_order + 1) * sizeof(list_t));
 	if (!span->free) {
 		free(span);
@@ -205,5 +204,5 @@
 	ra_arena_t *arena;
 
-	arena = (ra_arena_t *) malloc(sizeof(ra_arena_t), FRAME_ATOMIC);
+	arena = (ra_arena_t *) malloc(sizeof(ra_arena_t));
 	if (!arena)
 		return NULL;
Index: kernel/generic/src/lib/str.c
===================================================================
--- kernel/generic/src/lib/str.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/generic/src/lib/str.c	(revision ad896ebba1de338128a963fdca9134a0b48dc7c6)
@@ -634,5 +634,5 @@
 {
 	size_t size = str_size(src) + 1;
-	char *dest = malloc(size, 0);
+	char *dest = nfmalloc(size);
 	assert(dest);
 
@@ -667,5 +667,5 @@
 		size = n;
 
-	char *dest = malloc(size + 1, 0);
+	char *dest = nfmalloc(size + 1);
 	assert(dest);