From: DJ Delorie <dj@delorie.com>
Date: Fri, 10 Mar 2017 01:34:44 +0000 (-0500)
Subject: Merge branch 'master' into dj/malloc-tcache
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dad11d1aea27259d5a2ac2e4b6593cf653b49b3f;p=thirdparty%2Fglibc.git

Merge branch 'master' into dj/malloc-tcache
---

dad11d1aea27259d5a2ac2e4b6593cf653b49b3f
diff --cc elf/dl-tunables.list
index 3e498759cbe,cb9e8f173b9..37620c82e97
--- a/elf/dl-tunables.list
+++ b/elf/dl-tunables.list
@@@ -63,18 -74,7 +74,19 @@@ glibc 
        type: SIZE_T
        env_alias: MALLOC_ARENA_TEST
        minval: 1
+       security_level: SXID_IGNORE
      }
 +    tcache_max {
 +      type: SIZE_T
 +      env_alias: MALLOC_TCACHE_MAX
 +    }
 +    tcache_count {
 +      type: SIZE_T
 +      env_alias: MALLOC_TCACHE_COUNT
 +    }
 +    tcache_unsorted_limit {
 +      type: SIZE_T
 +      env_alias: MALLOC_TCACHE_UNSORTED_LIMIT
 +    }
    }
  }