From 8cab1d380a9a9743ed825533f389e0edb7b777d0 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 28 Sep 2000 22:47:06 +0000
Subject: [PATCH] Update.

2000-09-28  Ulrich Drepper  <drepper@redhat.com>

	* cancel.c (pthread_cancel): Don't do anything if cancelation is
	disabled.
---
 linuxthreads/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 6d22d9b8a5..90458288e9 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* cancel.c (pthread_cancel): Don't do anything if cancelation is
+	disabled.
+
 2000-09-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* spinlock.h (__pthread_set_own_extricate_if): Optimize a bit.