From 2eecb0478c16a0bd6122bab83d22e47ec4c65933 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 22 Feb 2006 17:06:14 +0000 Subject: * exceptions.cc (_cygtls::interrupt_now): Reorder conditional to call inside_kernel only if this isn't locked. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/exceptions.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * exceptions.cc (_cygtls::interrupt_now): Reorder conditional + to call inside_kernel only if this isn't locked. + 2006-02-22 Corinna Vinschen * 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 { -- cgit v1.2.3