diff options
| author | Christopher Ferris <cferris@google.com> | 2015-04-22 06:59:28 +0000 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-04-22 00:05:52 -0700 |
| commit | 83e5767ee9a8c68150cca06ae0d27a13ba4fcaf8 (patch) | |
| tree | 9c72852322473822033addd4f1d902e4b33338d4 /include/jemalloc/internal/chunk_dss.h | |
| parent | cfef1c84fffb9f781fccb0df4598e0dcdc022182 (diff) | |
| download | jemalloc-83e5767ee9a8c68150cca06ae0d27a13ba4fcaf8.tar.gz | |
Revert "Revert "Merge remote-tracking branch 'aosp/upstream-dev' into merge""
This reverts commit 75929a97332565c3b987986f35652b6d5d275d3c.
The original failure this was reverted for seems to have been a bug somewhere else.
Change-Id: Ib29ba03b1b967f940dc19eceac2aa1d2923be1eb
Diffstat (limited to 'include/jemalloc/internal/chunk_dss.h')
| -rw-r--r-- | include/jemalloc/internal/chunk_dss.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/jemalloc/internal/chunk_dss.h b/include/jemalloc/internal/chunk_dss.h index 4535ce0..87366a2 100644 --- a/include/jemalloc/internal/chunk_dss.h +++ b/include/jemalloc/internal/chunk_dss.h @@ -23,7 +23,8 @@ extern const char *dss_prec_names[]; dss_prec_t chunk_dss_prec_get(void); bool chunk_dss_prec_set(dss_prec_t dss_prec); -void *chunk_alloc_dss(size_t size, size_t alignment, bool *zero); +void *chunk_alloc_dss(arena_t *arena, void *new_addr, size_t size, + size_t alignment, bool *zero); bool chunk_in_dss(void *chunk); bool chunk_dss_boot(void); void chunk_dss_prefork(void); |