about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-09-09 16:22:01 +0000
committerUlrich Drepper <drepper@redhat.com>2006-09-09 16:22:01 +0000
commiteaa51b472caf30435e094b975308a5d45c13278a (patch)
treeb7e291796c002278839a66464891eb9913c8f0ed
parentd26d01d19ca19553c1049fe21a004f6caf2af386 (diff)
downloadglibc-eaa51b472caf30435e094b975308a5d45c13278a.tar.gz
glibc-eaa51b472caf30435e094b975308a5d45c13278a.tar.xz
glibc-eaa51b472caf30435e094b975308a5d45c13278a.zip
[BZ #3189]
..
	[BZ #3189, #3188]
	(mremap): Likewise.
-rw-r--r--ChangeLog3
-rw-r--r--misc/sys/mman.h16
2 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 06f58d9847..1b77fae51f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2006-09-09  Ulrich Drepper  <drepper@redhat.com>
 
-	[BZ #3189]
+	[BZ #3189, #3188]
 	* misc/sys/mman.h (remap_file_pages): Make available for _GNU_SOURCE.
+	(mremap): Likewise.
 
 2006-09-07  Jakub Jelinek  <jakub@redhat.com>
 
diff --git a/misc/sys/mman.h b/misc/sys/mman.h
index 59718a267f..4cd8a3fe72 100644
--- a/misc/sys/mman.h
+++ b/misc/sys/mman.h
@@ -116,14 +116,6 @@ extern int mlockall (int __flags) __THROW;
 extern int munlockall (void) __THROW;
 
 #ifdef __USE_MISC
-/* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length
-   NEW_LEN.  If MREMAP_MAYMOVE is set in FLAGS the returned address
-   may differ from ADDR.  If MREMAP_FIXED is set in FLAGS the function
-   takes another paramter which is a fixed address at which the block
-   resides after a successful call.  */
-extern void *mremap (void *__addr, size_t __old_len, size_t __new_len,
-		     int __flags, ...) __THROW;
-
 /* mincore returns the memory residency status of the pages in the
    current process's address space specified by [start, start + len).
    The status is returned in a vector of bytes.  The least significant
@@ -134,6 +126,14 @@ extern int mincore (void *__start, size_t __len, unsigned char *__vec)
 #endif
 
 #ifdef __USE_GNU
+/* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length
+   NEW_LEN.  If MREMAP_MAYMOVE is set in FLAGS the returned address
+   may differ from ADDR.  If MREMAP_FIXED is set in FLAGS the function
+   takes another paramter which is a fixed address at which the block
+   resides after a successful call.  */
+extern void *mremap (void *__addr, size_t __old_len, size_t __new_len,
+		     int __flags, ...) __THROW;
+
 /* Remap arbitrary pages of a shared backing store within an existing
    VMA.  */
 extern int remap_file_pages (void *__start, size_t __size, int __prot,