diff options
author | Mike Frysinger <vapier@chromium.org> | 2016-06-14 14:17:56 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@chromium.org> | 2016-06-14 14:17:56 -0400 |
commit | 67f738b7adb47dc1e3b272fb99062f4192fa6651 (patch) | |
tree | 122d14fcdd19b7e2e39aee74360900a2d9685a52 /src/common/memory.h | |
parent | Dump INFO CODE_ID containing Build ID in Linux dump_syms (diff) | |
download | breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.xz |
linux-syscall-support: pull in latest version
The sys_mmap/sys_mmap2 weirdness has been cleaned up in lss now and there
is only one API now for everyone -- sys_mmap.
R=mseaborn@chromium.org
Review URL: https://codereview.chromium.org/2065493006 .
Diffstat (limited to 'src/common/memory.h')
-rw-r--r-- | src/common/memory.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/common/memory.h b/src/common/memory.h index 16a612b8..9158b50c 100644 --- a/src/common/memory.h +++ b/src/common/memory.h @@ -44,7 +44,6 @@ #ifdef __APPLE__ #define sys_mmap mmap -#define sys_mmap2 mmap #define sys_munmap munmap #define MAP_ANONYMOUS MAP_ANON #else @@ -117,14 +116,8 @@ class PageAllocator { private: uint8_t *GetNPages(size_t num_pages) { -#if defined(__x86_64__) || defined(__aarch64__) || defined(__aarch64__) || \ - ((defined(__mips__) && _MIPS_SIM == _ABI64)) void *a = sys_mmap(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -#else - void *a = sys_mmap2(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -#endif if (a == MAP_FAILED) return NULL; |