diff --git a/configs/sabre-6quad/README.txt b/configs/sabre-6quad/README.txt
index 6c492857b2..62739fadd0 100644
--- a/configs/sabre-6quad/README.txt
+++ b/configs/sabre-6quad/README.txt
@@ -13,6 +13,7 @@ Contents
   - LEDs and Buttons
   - Using U-Boot to Run NuttX
   - Debugging with the Segger J-Link
+  - SMP
   - Configurations
 
 Status
@@ -436,6 +437,22 @@ A: Yes with the following modifications to the prodecure above.
        gdb> mon set pc 0x10800040
        gdb> s
 
+SMP
+===
+
+The i.MX6 6Quad has 4 CPUs.  Support is included for testing an SMP
+configuration.  That configuration is still not yet ready for usage but can
+be enabled with the following configuration settings:
+
+  Build Setup:
+    CONFIG_EXPERIMENTAL=y
+
+  RTOS Features -> Tasks and Scheduling
+    CONFIG_SPINLOCK=y
+    CONFIG_SMP=y
+    CONFIG_SMP_NCPUS=4
+    CONFIG_SMP_IDLETHREAD_STACKSIZE=2048
+
 Configurations
 ==============
 
diff --git a/sched/init/os_smpstart.c b/sched/init/os_smpstart.c
index c8be9c1cb1..5ed82fb878 100644
--- a/sched/init/os_smpstart.c
+++ b/sched/init/os_smpstart.c
@@ -47,6 +47,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/sched.h>
+#include <nuttx/sched_note.h>
 
 #include "group/group.h"
 #include "sched/sched.h"
diff --git a/sched/sched/sched_note.c b/sched/sched/sched_note.c
index ae414b096f..4dc1bd262e 100644
--- a/sched/sched/sched_note.c
+++ b/sched/sched/sched_note.c
@@ -516,7 +516,6 @@ ssize_t sched_note_size(void)
   ssize_t notelen;
   size_t circlen;
 
-  DEBUGASSERT(buffer != NULL);
   flags = enter_critical_section();
 
   /* Verify that the circular buffer is not empty */