diff --git a/ChangeLog b/ChangeLog
index b2d74eaf59..50ba655fc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-10  Andreas Schwab  <schwab@redhat.com>
 
+	* sysdeps/unix/sysv/linux/getpagesize.c: Don't assume AT_PAGESIZE
+	is always available.
+
 	* sysdeps/unix/sysv/linux/i386/Versions: Export __uname under
 	GLIBC_PRIVATE.
 	* nptl/Versions: Export __getrlimit under GLIBC_PRIVATE.
diff --git a/sysdeps/unix/sysv/linux/getpagesize.c b/sysdeps/unix/sysv/linux/getpagesize.c
index 0866079511..fe9bc8ead7 100644
--- a/sysdeps/unix/sysv/linux/getpagesize.c
+++ b/sysdeps/unix/sysv/linux/getpagesize.c
@@ -28,7 +28,7 @@
 int
 __getpagesize ()
 {
-#ifdef __ASSUME_AT_PAGESIZE
+#if 0 && defined __ASSUME_AT_PAGESIZE
   assert (GLRO(dl_pagesize) != 0);
   return GLRO(dl_pagesize);
 #else