Index: kernel/generic/include/adt/fifo.h
===================================================================
--- kernel/generic/include/adt/fifo.h	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/generic/include/adt/fifo.h	(revision 3a2692531629e5a8a32a01cf70175a2be26e50fd)
@@ -115,5 +115,5 @@
  */
 #define fifo_create(name) \
-	name.fifo = malloc(sizeof(*name.fifo) * name.items, 0)
+	name.fifo = nfmalloc(sizeof(*name.fifo) * name.items)
 
 #endif
Index: kernel/generic/include/mm/slab.h
===================================================================
--- kernel/generic/include/mm/slab.h	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/generic/include/mm/slab.h	(revision 3a2692531629e5a8a32a01cf70175a2be26e50fd)
@@ -140,9 +140,12 @@
 
 /* malloc support */
-extern void *malloc(size_t, unsigned int)
+extern void *malloc(size_t)
     __attribute__((malloc));
-extern void *realloc(void *, size_t, unsigned int)
+extern void *realloc(void *, size_t)
     __attribute__((warn_unused_result));
 extern void free(void *);
+
+extern void *nfmalloc(size_t)
+    __attribute__((malloc, returns_nonnull));
 
 #endif
Index: kernel/generic/include/synch/rcu.h
===================================================================
--- kernel/generic/include/synch/rcu.h	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/generic/include/synch/rcu.h	(revision 3a2692531629e5a8a32a01cf70175a2be26e50fd)
@@ -55,5 +55,5 @@
  *
  * // Insert at the beginning of the list.
- * exam_t *my_exam = malloc(sizeof(exam_t), FRAME_ATOMIC);
+ * exam_t *my_exam = malloc(sizeof(exam_t));
  * my_exam->grade = 5;
  * my_exam->next = exam_list;