about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/unix/sysv/linux/Makefile7
-rw-r--r--sysdeps/unix/sysv/linux/bits/mman-linux.h (renamed from bits/mman-linux.h)5
3 files changed, 9 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d383093c6..632c2a037a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-11-07  Florian Weimer  <fweimer@redhat.com>
+
+	* bits/mman-linux.h: Move ...
+	* sysdeps/unix/sysv/linux/bits/mman-linux.h: ... here.  Update
+	comment.
+	* sysdeps/unix/sysv/linux/bits/Makefile (sysdep_headers): Remove
+	outdated comment.
+
 2017-11-07  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S (STRNLEN):
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 0c8a009b5e..bf76b8773d 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -28,13 +28,6 @@ CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-sync_file_range.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))"
 
-# Note that bits/mman-linux.h is listed here though the file lives in the
-# top-level bits/ subdirectory instead of here in sysdeps/.../linux/bits/.
-# That is just so that other (non-Linux) configurations for whom the
-# bits/mman-linux.h definitions work well do not have to duplicate the
-# contents of the file.  The file must still be listed in sysdep_headers
-# here and in any non-Linux configuration that uses it; other
-# configurations will not install the file.
 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/klog.h \
 		  sys/user.h sys/prctl.h \
diff --git a/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h
index 8126ce8369..b091181960 100644
--- a/bits/mman-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h
@@ -21,10 +21,7 @@
 #endif
 
 /* The following definitions basically come from the kernel headers.
-   But the kernel header is not namespace clean.
-
-   This file is also used by some non-Linux configurations of the
-   GNU C Library, for other systems that use these same bit values.  */
+   But the kernel header is not namespace clean.  */
 
 
 /* Protections are chosen from these bits, OR'd together.  The