diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 905a6beb64..00d5e39478 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* pthread_create.c (start_thread): Check __PTHREAD_MUTEX_HAVE_PREV
+	instead of __WORDSIZE.
+
 2012-05-10  Thomas Schwinge  <thomas@schwinge.name>
 
 	[BZ #3748]
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 09148852f9..3c1e4794c7 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -355,7 +355,7 @@ start_thread (void *arg)
 
 #ifndef __ASSUME_SET_ROBUST_LIST
   /* If this thread has any robust mutexes locked, handle them now.  */
-# if __WORDSIZE == 64
+# ifdef __PTHREAD_MUTEX_HAVE_PREV
   void *robust = pd->robust_head.list;
 # else
   __pthread_slist_t *robust = pd->robust_list.__next;