From: Carlos O'Donell <carlos@systemhalted.org>
Date: Sun, 16 Jul 2006 18:25:24 +0000 (+0000)
Subject: 2006-07-15  Jeff Bailey  <jbailey@ubuntu.com>
X-Git-Tag: glibc-2.16-ports-before-merge~845
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f9c5a916b67e097cfc48240420f506d96c3e0d5;p=thirdparty%2Fglibc.git

2006-07-15  Jeff Bailey  <jbailey@ubuntu.com>

	* sysdeps/hppa/nptl/tls.h (TLS_INIT_TP): Return NULL.
---

diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index 076ce1ffa87..b4c45d7818a 100644
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,3 +1,7 @@
+2006-07-15  Jeff Bailey  <jbailey@ubuntu.com>
+
+	* sysdeps/hppa/nptl/tls.h (TLS_INIT_TP): Return NULL.
+
 2006-07-13  Carlos O'Donell  <carlos@systemhalted.org>
 
 	* sysdeps/unix/sysv/linux/hppa/xstat.c: New file.
diff --git a/sysdeps/hppa/nptl/tls.h b/sysdeps/hppa/nptl/tls.h
index 1bbeeaafac9..0759aec8f0c 100644
--- a/sysdeps/hppa/nptl/tls.h
+++ b/sysdeps/hppa/nptl/tls.h
@@ -102,7 +102,7 @@ typedef struct
    special attention since 'errno' is not yet available and if the
    operation can cause a failure 'errno' must not be touched.  */
 # define TLS_INIT_TP(tcbp, secondcall) \
-  ({ __set_cr27(tcbp); 0; })
+  ({ __set_cr27(tcbp); NULL; })
 
 /* Return the address of the dtv for the current thread.  */
 # define THREAD_DTV() \