* allocatestack.c (allocate_stack): Make code compile if

	__ASSUME_PRIVATE_FUTEX is set.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d1375ee9efdaf1b697474d3de57763ff08636701..06fb1d991fbe82dea330c19d449d50fa4a5928a6 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-17  Ulrich Drepper  <drepper@redhat.com>
+
+       * allocatestack.c (allocate_stack): Make code compile if
+       __ASSUME_PRIVATE_FUTEX is set.
+
 2007-06-17  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
        * sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S:

diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 76d75fef2c1396f57583871853ec22443721c7f5..145fe0a35ffdad3127b7a6503e50f4e67472707d 100644 (file)
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -516,9 +516,11 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
          __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
 #endif
 
+#ifndef __ASSUME_PRIVATE_FUTEX
          /* The thread must know when private futexes are supported.  */
          pd->header.private_futex = THREAD_GETMEM (THREAD_SELF,
                                                     header.private_futex);
+#endif
 
 #ifdef NEED_DL_SYSINFO
          /* Copy the sysinfo value from the parent.  */