--- libaitsched/src/hooks.c	2012/05/03 15:05:09	1.5.2.2
+++ libaitsched/src/hooks.c	2012/05/10 14:44:22	1.5.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.5.2.2 2012/05/03 15:05:09 misho Exp $
+* $Id: hooks.c,v 1.5.2.3 2012/05/10 14:44:22 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -223,7 +223,6 @@ sched_hook_fetch(void *root, void *arg __unused)
 		return NULL;
 
 	/* get new task by queue priority */
-retry:
 	while ((task = TAILQ_FIRST(&r->root_event))) {
 #ifdef HAVE_LIBPTHREAD
 		pthread_mutex_lock(&r->root_mtx[taskEVENT]);
@@ -306,15 +305,9 @@ retry:
 		if (r->root_hooks.hook_exec.exception) {
 			if (r->root_hooks.hook_exec.exception(r, NULL))
 				return NULL;
-		} else
+		} else if (errno != EINTR)
 			LOGERR;
-#ifdef NDEBUG
-		/* kevent no exit by error, if non-debug version */
-		goto retry;
-#else
-		/* diagnostic exit from scheduler if kevent error occur */
 		return NULL;
-#endif
 	}
 
 	now.tv_sec = now.tv_nsec = 0;