about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2017-05-03 16:25:15 -0400
committerDJ Delorie <dj@delorie.com>2017-05-03 16:28:01 -0400
commit3b5f801ddb838311b5b05c218caac3bdb00d7c95 (patch)
treef118416450a44fd2ab445b16acb639d1a4dacaf9
parente35ac97cc887a89f27c0a4ceb789cf4a7d433556 (diff)
downloadglibc-3b5f801ddb838311b5b05c218caac3bdb00d7c95.tar.gz
glibc-3b5f801ddb838311b5b05c218caac3bdb00d7c95.tar.xz
glibc-3b5f801ddb838311b5b05c218caac3bdb00d7c95.zip
Tweak realloc/MREMAP comment to be more accurate.
MMap'd memory isn't shrunk without MREMAP, but IIRC this is intentional for
performance reasons.  Regardless, this patch tweaks the existing comment to
be more accurate wrt the existing code.

	[BZ #21411]
	* malloc/malloc.c: Tweak realloc/MREMAP comment to be more accurate.
-rw-r--r--ChangeLog5
-rw-r--r--malloc/malloc.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e13d668a7..ad8e78ef7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-03  DJ Delorie  <dj@redhat.com>
+
+	[BZ #21411]
+	* malloc/malloc.c: Tweak realloc/MREMAP comment to be more accurate.
+
 2017-05-03  Phil Blundell  <pb@pbcl.net>
 
 	* inet/netinet/in.h (struct ip_mreq_source): Correct misplaced
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 068ffc1684..aa45626093 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -514,9 +514,9 @@ void*  __libc_calloc(size_t, size_t);
   REALLOC_ZERO_BYTES_FREES is set, realloc with a size argument of
   zero (re)allocates a minimum-sized chunk.
 
-  Large chunks that were internally obtained via mmap will always
-  be reallocated using malloc-copy-free sequences unless
-  the system supports MREMAP (currently only linux).
+  Large chunks that were internally obtained via mmap will always be
+  grown using malloc-copy-free sequences unless the system supports
+  MREMAP (currently only linux).
 
   The old unix realloc convention of allowing the last-free'd chunk
   to be used as an argument to realloc is not supported.