aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h')
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
index 91f9b30c0ca2..5e523e2c6be3 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,24 +1,22 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-04-14 18:40:48 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-07-19 18:45:05 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -28,12 +28,16 @@
+@@ -28,10 +28,14 @@
#if defined(OS_ANDROID)
#include <sys/prctl.h>
#endif
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include <sys/resource.h>
-
- #include <algorithm>
#endif
-+#if defined(OS_FREEBSD)
++#if defined(OS_BSD)
+#include <fcntl.h>
+#endif
+
#include "base/allocator/partition_allocator/page_allocator.h"
#ifndef MAP_ANONYMOUS
-@@ -153,12 +157,19 @@ void* SystemAllocPagesInternal(void* hint,
+@@ -151,12 +155,19 @@ void* SystemAllocPagesInternal(void* hint,
PA_DCHECK(PageTag::kFirst <= page_tag);
PA_DCHECK(PageTag::kLast >= page_tag);
int fd = VM_MAKE_TAG(static_cast<int>(page_tag));
@@ -38,7 +36,7 @@
#if defined(OS_APPLE)
// On macOS 10.14 and higher, executables that are code signed with the
-@@ -185,6 +196,8 @@ void* SystemAllocPagesInternal(void* hint,
+@@ -183,6 +194,8 @@ void* SystemAllocPagesInternal(void* hint,
prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length,
PageTagToName(page_tag));
}
@@ -47,7 +45,7 @@
#endif
return ret;
-@@ -317,6 +330,8 @@ void DiscardSystemPagesInternal(void* address, size_t
+@@ -334,6 +347,8 @@ void DiscardSystemPagesInternal(void* address, size_t
ret = madvise(address, length, MADV_DONTNEED);
}
PA_PCHECK(ret == 0);