aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc')
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc15
1 files changed, 3 insertions, 12 deletions
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
index 96ad9699c0a1..d5d4496bfa86 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-02-23 21:04:38 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-04-19 13:02:56 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -47,7 +47,7 @@
#include "wow64apiset.h"
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
-@@ -278,7 +278,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -279,7 +279,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@@ -18,16 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
-@@ -377,7 +377,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
- (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
- MinPurgeableSlotSize();
- #elif BUILDFLAG(IS_APPLE) || \
-- ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && \
-+ ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \
- defined(ARCH_CPU_ARM64))
- // It's better for slot_usage to be stack-allocated and fixed-size, which
- // demands that its size be constexpr. On IS_APPLE and Linux on arm64,
-@@ -942,7 +942,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
+@@ -950,7 +950,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));