diff --git a/patches/series b/patches/series index f1734883..64caf62a 100644 --- a/patches/series +++ b/patches/series @@ -1,5 +1,3 @@ -upstream-fixes/glue_core_pools.patch -upstream-fixes/hardware_destructive_interference_size.patch upstream-fixes/missing-dependencies.patch upstream-fixes/fix-crash-without-enterprise-cloud-content-analysis.patch diff --git a/patches/upstream-fixes/glue_core_pools.patch b/patches/upstream-fixes/glue_core_pools.patch deleted file mode 100644 index 51ebd8c7..00000000 --- a/patches/upstream-fixes/glue_core_pools.patch +++ /dev/null @@ -1,27 +0,0 @@ -# glue_core_pools was partially removed in: -# https://chromium-review.googlesource.com/c/chromium/src/+/5922801 -# This removes the remaining references needed to build ---- a/base/allocator/partition_allocator/partition_alloc.gni -+++ b/base/allocator/partition_allocator/partition_alloc.gni -@@ -239,9 +239,6 @@ declare_args() { - force_enable_raw_ptr_exclusion = false - } - --assert(!enable_pointer_compression_support || glue_core_pools, -- "Pointer compression relies on core pools being contiguous.") -- - declare_args() { - # We want to use RawPtrBackupRefImpl as the raw_ptr<> implementation - # iff BRP support is enabled. However, for purpose of performance ---- a/base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h -+++ b/base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h -@@ -21,9 +21,6 @@ - - #if PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) - --#if !PA_BUILDFLAG(GLUE_CORE_POOLS) --#error "Pointer compression only works with glued pools" --#endif - #if PA_CONFIG(DYNAMICALLY_SELECT_POOL_SIZE) - #error "Pointer compression currently supports constant pool size" - #endif diff --git a/patches/upstream-fixes/hardware_destructive_interference_size.patch b/patches/upstream-fixes/hardware_destructive_interference_size.patch deleted file mode 100644 index 4746a44f..00000000 --- a/patches/upstream-fixes/hardware_destructive_interference_size.patch +++ /dev/null @@ -1,25 +0,0 @@ -# hardware_destructive_interference_size was added in: -# https://chromium-review.googlesource.com/c/chromium/src/+/5767325 -# then partially reverted in: -# https://chromium-review.googlesource.com/c/chromium/src/+/5841144 -# This reverts the remaining change ---- a/components/media_router/common/providers/cast/channel/enum_table.h -+++ b/components/media_router/common/providers/cast/channel/enum_table.h -@@ -12,7 +12,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -368,7 +367,8 @@ class EnumTable { - - private: - #ifdef ARCH_CPU_64_BITS -- alignas(std::hardware_destructive_interference_size) -+ // Align the data on a cache line boundary. -+ alignas(64) - #endif - std::initializer_list data_; - bool is_sorted_;