1 files changed, 4 insertions, 0 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index d90ac36091..725c87d6bb 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -29,6 +29,7 @@
 #include <stackinfo.h>
 #include <internaltypes.h>
 #include <pthread-functions.h>
+#include <atomic.h>
 
 
 /* Internal variables.  */
@@ -149,6 +150,9 @@ __do_cancel (void)
 {
   struct pthread *self = THREAD_SELF;
 
+  /* Make sure we get no more cancellations.  */
+  atomic_bit_set (&self->cancelhandling, EXITING_BIT);
+
   /* Throw an exception.  */
   // XXX TBI