diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d1375ee9ef..06fb1d991f 100644
--- 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 76d75fef2c..145fe0a35f 100644
--- 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.  */