X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fcancel_impl.c;h=0d80885f1959afdc5c9b908deccfa0232a97c8ed;hb=73d2fde1195401dfb87935f46126f9481af1a8c3;hp=2d2bb572553117d1483f05f4d6d565d688851a44;hpb=09dae2b7b66f741b30aa7ce95ab395239da20762;p=musl

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 2d2bb572..0d80885f 100644
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -17,7 +17,7 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
 	uintptr_t old_sp, old_ip;
 	long r;
 
-	if (!libc.lock || (self = __pthread_self())->canceldisable)
+	if (!libc.threaded || (self = __pthread_self())->canceldisable)
 		return __syscall(nr, u, v, w, x, y, z);
 
 	old_sp = self->cp_sp;
@@ -27,7 +27,7 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
 	r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
 	self->cp_ip = old_ip;
 	self->cp_sp = old_sp;
-	if (r == -EINTR && self->cancel) __cancel();
+	if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
 	return r;
 }