diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9c5de1959..fac9a795e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* exceptions.cc (_cygtls::interrupt_now): Reorder conditional
+	to call inside_kernel only if this isn't locked.
+
 2006-02-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.cc (fhandler_base::open): Add FILE_READ_ATTRIBUTES to
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index cce217e87..33ba9f02d 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -726,7 +726,7 @@ _cygtls::interrupt_now (CONTEXT *cx, int sig, void *handler,
 {
   bool interrupted;
 
-  if (!inside_kernel (cx) || (incyg || spinning || locked ()))
+  if (incyg || spinning || locked () || !inside_kernel (cx))
     interrupted = false;
   else
     {