main/chromium: memtag oopsie

chimera-linux · Oct 2, 2024 · 36b96df · 36b96df
1 parent 9b059fc
commit 36b96df
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/main/chromium/patches/023-aarch64-no-memtag.patch b/main/chromium/patches/023-aarch64-no-memtag.patch
@@ -31,15 +31,17 @@ index 600d4ed784..37defaa364 100644
  #endif
 
 diff --git a/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc b/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
-index 295d0cebc2..2a9b409968 100644
+index 295d0ce..9381363 100644
 --- a/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
 +++ b/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
-@@ -8,7 +8,7 @@
+@@ -8,8 +8,8 @@
  #include "partition_alloc/buildflags.h"
  #include "partition_alloc/page_allocator.h"
 
 -#if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \
-+#if 0 && PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \
-     (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1))
+-    (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1))
++#if 0 && (PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \
++    (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)))
  struct __ifunc_arg_t;
 
+ #include "partition_alloc/aarch64_support.h"