diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-16 11:10:55 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-16 11:10:55 +0000 |
| commit | 75929a97332565c3b987986f35652b6d5d275d3c (patch) | |
| tree | 6c24378eef62b4381033b9615d247f5934fc0342 /include/jemalloc/internal/chunk_dss.h | |
| parent | 5b5d97b42e84c2ac417271c3fab6fc282496a335 (diff) | |
| download | jemalloc-75929a97332565c3b987986f35652b6d5d275d3c.tar.gz | |
Revert "Merge remote-tracking branch 'aosp/upstream-dev' into merge"
Revert due to random ART crashes seen.
This reverts commit 5b5d97b42e84c2ac417271c3fab6fc282496a335.
Change-Id: I62a784301fded7ee853b182d172be46bb32bded7
Diffstat (limited to 'include/jemalloc/internal/chunk_dss.h')
| -rw-r--r-- | include/jemalloc/internal/chunk_dss.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/jemalloc/internal/chunk_dss.h b/include/jemalloc/internal/chunk_dss.h index 87366a2..4535ce0 100644 --- a/include/jemalloc/internal/chunk_dss.h +++ b/include/jemalloc/internal/chunk_dss.h @@ -23,8 +23,7 @@ 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(arena_t *arena, void *new_addr, size_t size, - size_t alignment, bool *zero); +void *chunk_alloc_dss(size_t size, size_t alignment, bool *zero); bool chunk_in_dss(void *chunk); bool chunk_dss_boot(void); void chunk_dss_prefork(void); |