From owner-svn-src-all@FreeBSD.ORG  Sat Sep 25 09:43:25 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F16D106566B;
	Sat, 25 Sep 2010 09:43:25 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1EA2C8FC12;
	Sat, 25 Sep 2010 09:43:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8P9hPj1056518;
	Sat, 25 Sep 2010 09:43:25 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8P9hPPC056516;
	Sat, 25 Sep 2010 09:43:25 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201009250943.o8P9hPPC056516@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Sat, 25 Sep 2010 09:43:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213163 - head/lib/libthr/thread
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Sep 2010 09:43:25 -0000

Author: davidxu
Date: Sat Sep 25 09:43:24 2010
New Revision: 213163
URL: http://svn.freebsd.org/changeset/base/213163

Log:
  Only access unwind_disabled when _PTHREAD_FORCED_UNWIND is defined.

Modified:
  head/lib/libthr/thread/thr_clean.c

Modified: head/lib/libthr/thread/thr_clean.c
==============================================================================
--- head/lib/libthr/thread/thr_clean.c	Sat Sep 25 09:16:46 2010	(r213162)
+++ head/lib/libthr/thread/thr_clean.c	Sat Sep 25 09:43:24 2010	(r213163)
@@ -80,8 +80,9 @@ _pthread_cleanup_push(void (*routine) (v
 {
 	struct pthread	*curthread = _get_curthread();
 	struct pthread_cleanup *newbuf;
-
+#ifdef _PTHREAD_FORCED_UNWIND
 	curthread->unwind_disabled = 1;
+#endif
 	if ((newbuf = (struct pthread_cleanup *)
 	    malloc(sizeof(struct _pthread_cleanup_info))) != NULL) {
 		newbuf->routine = routine;