diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-05-21 16:13:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-05-21 16:13:18 +0000 |
| commit | 1f4843fbffccebc60f85b1e1a48711d4fb9ab210 (patch) | |
| tree | 0742979c57093478feb748b0798bd6f5336b4fed /malloc/arena.c | |
| parent | 12e8bbff8fef7bbfbcea4ac757cd6822f8eceffb (diff) | |
| download | glibc-1f4843fbffccebc60f85b1e1a48711d4fb9ab210.tar.gz glibc-1f4843fbffccebc60f85b1e1a48711d4fb9ab210.tar.xz glibc-1f4843fbffccebc60f85b1e1a48711d4fb9ab210.zip | |
* malloc/hooks.c (MALLOC_STATE_VERSION): Bump.
(public_sET_STATe): If ms->version < 3, put all chunks into
unsorted chunks and clear {fd,bk}_nextsize fields of largebin
chunks.
* malloc/malloc.c [MALLOC_DEBUG]: Revert 2007-05-13 changes.
* malloc/hooks.c: Likewise.
* malloc/arena.c: Likewise.
* malloc/malloc.c (do_check_malloc_state): Don't assert
n_mmaps is not greater than n_mmaps_max. This removes the need
for the previous change.
* malloc/Makefile (CFLAGS-malloc.c): Revert accidental
2007-05-07 commit.
Diffstat (limited to 'malloc/arena.c')
| -rw-r--r-- | malloc/arena.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/malloc/arena.c b/malloc/arena.c index 9e3ff47347..ce64335567 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -370,9 +370,6 @@ ptmalloc_init_minimal (void) mp_.top_pad = DEFAULT_TOP_PAD; #endif mp_.n_mmaps_max = DEFAULT_MMAP_MAX; -#if MALLOC_DEBUG - mp_.n_mmaps_cmax = DEFAULT_MMAP_MAX; -#endif mp_.mmap_threshold = DEFAULT_MMAP_THRESHOLD; mp_.trim_threshold = DEFAULT_TRIM_THRESHOLD; mp_.pagesize = malloc_getpagesize; |