diff --git a/ChangeLog b/ChangeLog
index 1adcdf139d..95611f3a1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-05-11  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/arm/nptl/bits/pthreadtypes-arch.h
+	(__pthread_rwlock_arch_t): Remove __data definition.
+	* sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
+	(__pthread_rwlock_arch_t): Likewise.
+
 2017-05-11  Florian Weimer  <fweimer@redhat.com>
 
 	* resolv/inet_pton.c: Reformat in GNU style.  Remove
diff --git a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h
index 8333acb4ec..3f9eca4645 100644
--- a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h
+++ b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h
@@ -62,7 +62,7 @@ struct __pthread_rwlock_arch_t
   unsigned char __pad2;
 #endif
   int __cur_writer;
-} __data;
+};
 
 #define __PTHREAD_RWLOCK_ELISION_EXTRA 0
 
diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
index 131e30e93d..7befe5de6d 100644
--- a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
+++ b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
@@ -82,7 +82,7 @@ struct __pthread_rwlock_arch_t
   int __reserved2;
   int __reserved3;
   int __reserved4;
-} __data;
+};
 
 #define __PTHREAD_RWLOCK_ELISION_EXTRA 0