Index: kernel/genarch/src/acpi/madt.c
===================================================================
--- kernel/genarch/src/acpi/madt.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/acpi/madt.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -197,6 +197,5 @@
 	/* Create MADT APIC entries index array */
 	madt_entries_index = (struct madt_apic_header **)
-	    malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header *),
-	    FRAME_ATOMIC);
+	    malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header *));
 	if (!madt_entries_index)
 		panic("Memory allocation error.");
Index: kernel/genarch/src/ddi/ddi-bitmap.c
===================================================================
--- kernel/genarch/src/ddi/ddi-bitmap.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/ddi/ddi-bitmap.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -68,5 +68,5 @@
 		 */
 
-		void *store = malloc(bitmap_size(elements), FRAME_ATOMIC);
+		void *store = malloc(bitmap_size(elements));
 		if (!store)
 			return ENOMEM;
Index: kernel/genarch/src/drivers/dsrln/dsrlnin.c
===================================================================
--- kernel/genarch/src/drivers/dsrln/dsrlnin.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/dsrln/dsrlnin.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -57,5 +57,5 @@
 {
 	dsrlnin_instance_t *instance =
-	    malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC);
+	    malloc(sizeof(dsrlnin_instance_t));
 	if (instance) {
 		instance->dsrlnin = dev;
Index: kernel/genarch/src/drivers/dsrln/dsrlnout.c
===================================================================
--- kernel/genarch/src/drivers/dsrln/dsrlnout.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/dsrln/dsrlnout.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -70,10 +70,9 @@
 outdev_t *dsrlnout_init(ioport8_t *base)
 {
-	outdev_t *dsrlndev = malloc(sizeof(outdev_t), FRAME_ATOMIC);
+	outdev_t *dsrlndev = malloc(sizeof(outdev_t));
 	if (!dsrlndev)
 		return NULL;
 
-	dsrlnout_instance_t *instance = malloc(sizeof(dsrlnout_instance_t),
-	    FRAME_ATOMIC);
+	dsrlnout_instance_t *instance = malloc(sizeof(dsrlnout_instance_t));
 	if (!instance) {
 		free(dsrlndev);
Index: kernel/genarch/src/drivers/ega/ega.c
===================================================================
--- kernel/genarch/src/drivers/ega/ega.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/ega/ega.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -584,9 +584,9 @@
 outdev_t *ega_init(ioport8_t *base, uintptr_t addr)
 {
-	outdev_t *egadev = malloc(sizeof(outdev_t), FRAME_ATOMIC);
+	outdev_t *egadev = malloc(sizeof(outdev_t));
 	if (!egadev)
 		return NULL;
 
-	ega_instance_t *instance = malloc(sizeof(ega_instance_t), FRAME_ATOMIC);
+	ega_instance_t *instance = malloc(sizeof(ega_instance_t));
 	if (!instance) {
 		free(egadev);
@@ -609,5 +609,5 @@
 	}
 
-	instance->backbuf = (uint8_t *) malloc(EGA_VRAM_SIZE, FRAME_ATOMIC);
+	instance->backbuf = (uint8_t *) malloc(EGA_VRAM_SIZE);
 	if (!instance->backbuf) {
 		LOG("Unable to allocate backbuffer.");
Index: kernel/genarch/src/drivers/i8042/i8042.c
===================================================================
--- kernel/genarch/src/drivers/i8042/i8042.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/i8042/i8042.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -106,5 +106,5 @@
 {
 	i8042_instance_t *instance =
-	    malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
+	    malloc(sizeof(i8042_instance_t));
 	if (instance) {
 		instance->i8042 = dev;
Index: kernel/genarch/src/drivers/ns16550/ns16550.c
===================================================================
--- kernel/genarch/src/drivers/ns16550/ns16550.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/ns16550/ns16550.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -129,5 +129,5 @@
 {
 	ns16550_instance_t *instance =
-	    malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC);
+	    malloc(sizeof(ns16550_instance_t));
 	if (instance) {
 		instance->ns16550 = dev;
@@ -137,6 +137,5 @@
 
 		if (output) {
-			instance->output = malloc(sizeof(outdev_t),
-			    FRAME_ATOMIC);
+			instance->output = malloc(sizeof(outdev_t));
 			if (!instance->output) {
 				free(instance);
Index: kernel/genarch/src/drivers/pl050/pl050.c
===================================================================
--- kernel/genarch/src/drivers/pl050/pl050.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/pl050/pl050.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -77,5 +77,5 @@
 
 	pl050_instance_t *instance =
-	    malloc(sizeof(pl050_instance_t), FRAME_ATOMIC);
+	    malloc(sizeof(pl050_instance_t));
 
 	pl050 = dev;
Index: kernel/genarch/src/drivers/s3c24xx/uart.c
===================================================================
--- kernel/genarch/src/drivers/s3c24xx/uart.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/s3c24xx/uart.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -102,10 +102,10 @@
 outdev_t *s3c24xx_uart_init(uintptr_t paddr, inr_t inr)
 {
-	outdev_t *uart_dev = malloc(sizeof(outdev_t), FRAME_ATOMIC);
+	outdev_t *uart_dev = malloc(sizeof(outdev_t));
 	if (!uart_dev)
 		return NULL;
 
 	s3c24xx_uart_t *uart =
-	    malloc(sizeof(s3c24xx_uart_t), FRAME_ATOMIC);
+	    malloc(sizeof(s3c24xx_uart_t));
 	if (!uart) {
 		free(uart_dev);
Index: kernel/genarch/src/drivers/via-cuda/cuda.c
===================================================================
--- kernel/genarch/src/drivers/via-cuda/cuda.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/drivers/via-cuda/cuda.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -91,5 +91,5 @@
 {
 	cuda_instance_t *instance =
-	    malloc(sizeof(cuda_instance_t), FRAME_ATOMIC);
+	    malloc(sizeof(cuda_instance_t));
 	if (instance) {
 		instance->cuda = dev;
Index: kernel/genarch/src/fb/fb.c
===================================================================
--- kernel/genarch/src/fb/fb.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/fb/fb.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -571,9 +571,9 @@
 	}
 
-	outdev_t *fbdev = malloc(sizeof(outdev_t), FRAME_ATOMIC);
+	outdev_t *fbdev = malloc(sizeof(outdev_t));
 	if (!fbdev)
 		return NULL;
 
-	fb_instance_t *instance = malloc(sizeof(fb_instance_t), FRAME_ATOMIC);
+	fb_instance_t *instance = malloc(sizeof(fb_instance_t));
 	if (!instance) {
 		free(fbdev);
@@ -618,5 +618,5 @@
 	}
 
-	instance->backbuf = (uint16_t *) malloc(bbsize, FRAME_ATOMIC);
+	instance->backbuf = (uint16_t *) malloc(bbsize);
 	if (!instance->backbuf) {
 		LOG("Unable to allocate backbuffer.");
@@ -626,5 +626,5 @@
 	}
 
-	instance->glyphs = (uint8_t *) malloc(glyphsize, FRAME_ATOMIC);
+	instance->glyphs = (uint8_t *) malloc(glyphsize);
 	if (!instance->glyphs) {
 		LOG("Unable to allocate glyphs.");
@@ -635,5 +635,5 @@
 	}
 
-	instance->bgscan = malloc(instance->bgscanbytes, FRAME_ATOMIC);
+	instance->bgscan = malloc(instance->bgscanbytes);
 	if (!instance->bgscan) {
 		LOG("Unable to allocate background pixel.");
Index: kernel/genarch/src/kbrd/kbrd.c
===================================================================
--- kernel/genarch/src/kbrd/kbrd.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/kbrd/kbrd.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -172,5 +172,5 @@
 {
 	kbrd_instance_t *instance =
-	    malloc(sizeof(kbrd_instance_t), FRAME_ATOMIC);
+	    malloc(sizeof(kbrd_instance_t));
 	if (instance) {
 		instance->thread = thread_create(kkbrd, (void *) instance,
Index: kernel/genarch/src/kbrd/kbrd_at.c
===================================================================
--- kernel/genarch/src/kbrd/kbrd_at.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/kbrd/kbrd_at.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -170,5 +170,5 @@
 	kbrd_instance_t *instance;
 
-	instance = malloc(sizeof(kbrd_instance_t), FRAME_ATOMIC);
+	instance = malloc(sizeof(kbrd_instance_t));
 	if (instance) {
 		instance->thread = thread_create(kkbrd, (void *) instance, TASK, 0,
Index: kernel/genarch/src/ofw/ofw_tree.c
===================================================================
--- kernel/genarch/src/ofw/ofw_tree.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/ofw/ofw_tree.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -348,5 +348,5 @@
 		return NULL;
 
-	void *dump = malloc(*size, FRAME_ATOMIC);
+	void *dump = malloc(*size);
 	if (dump == NULL) {
 		*size = 0;
@@ -386,5 +386,5 @@
 static void ofw_tree_node_sysinfo(ofw_tree_node_t *node, const char *path)
 {
-	char *cur_path = (char *) malloc(PATH_MAX_LEN, 0);
+	char *cur_path = (char *) nfmalloc(PATH_MAX_LEN);
 
 	for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) {
Index: kernel/genarch/src/srln/srln.c
===================================================================
--- kernel/genarch/src/srln/srln.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/genarch/src/srln/srln.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
@@ -130,5 +130,5 @@
 {
 	srln_instance_t *instance =
-	    malloc(sizeof(srln_instance_t), FRAME_ATOMIC);
+	    malloc(sizeof(srln_instance_t));
 	if (instance) {
 		instance->thread = thread_create(ksrln, (void *) instance,