about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bits/mman-linux.h (renamed from sysdeps/unix/sysv/linux/bits/mman-linux.h)0
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 84c4bfb8b7..eed1ce9658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-18  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/unix/sysv/linux/bits/mman-linux.h: Moved to ...
+	* bits/mman-linux.h: ... here.
+
 2014-03-18  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* conform/conformtest.pl: Add standard definition when calling C
diff --git a/sysdeps/unix/sysv/linux/bits/mman-linux.h b/bits/mman-linux.h
index 45f76f568c..45f76f568c 100644
--- a/sysdeps/unix/sysv/linux/bits/mman-linux.h
+++ b/bits/mman-linux.h