Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision 741fd168039c63304d28851d0bfb573bd41fec74)
+++ kernel/generic/src/syscall/syscall.c	(revision 31696b4fbd84b5c8090a758e9a35ba49a9156b52)
@@ -119,4 +119,11 @@
 #ifdef CONFIG_UDEBUG
 	udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
+
+	/*
+	 * Stopping point needed for tasks that only invoke non-blocking
+	 * system calls.
+	 */
+	udebug_stoppable_begin();
+	udebug_stoppable_end();
 #endif	
 	return rc;
