aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc')
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
index 06b2673bf136..22f583a2730f 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
@@ -1,12 +1,15 @@
---- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-01-18 21:28:44 UTC
+--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-03-12 23:57:15 UTC
+++ base/allocator/partition_allocator/partition_alloc.cc
-@@ -65,6 +65,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
+@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
+ "maximum direct mapped allocation");
+
// Check that some of our zanier calculations worked out as expected.
- #if ENABLE_TAG_FOR_MTE_CHECKED_PTR
- static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket");
-+#elif defined(__i386__) && defined(OS_FREEBSD)
++#if defined(__i386__) && defined(OS_FREEBSD)
+ // alignof(std::max_align_t) is only 4 on FreeBSD/i386
+ static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket");
- #else
++#else
static_assert(kSmallestBucket == kAlignment, "generic smallest bucket");
- #endif
++#endif
+ static_assert(kMaxBucketed == 983040, "generic max bucketed");
+ STATIC_ASSERT_OR_PA_CHECK(
+ MaxSystemPagesPerSlotSpan() < (1 << 8),