From 3a5b1f6b7bf564796202885d910321e6c3cf0411 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Jan 2023 13:43:50 +0100 Subject: [PATCH] fix up mm patch in 4.9, 4.14, and 4.19 --- ...m-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch | 4 ++-- ...m-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch | 4 ++-- ...m-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/queue-4.14/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch b/queue-4.14/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch index 751d1957af9..1b54f7163fe 100644 --- a/queue-4.14/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch +++ b/queue-4.14/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch @@ -31,7 +31,7 @@ ptes were refactored into a common helper between 5.15 and 6.0; TLB flushing was refactored between 5.4 and 5.10; TLB flushing was refactored between 4.19 and 5.4; pmd collapse for PTE-mapped THP was only added in 5.4; -ugly hack for s390 in <=4.19] +ugly hack for s390 in <=4.19 and arm] Signed-off-by: Jann Horn Signed-off-by: Greg Kroah-Hartman --- @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman #include "internal.h" +/* gross hack for <=4.19 stable */ -+#ifdef CONFIG_S390 ++#if defined(CONFIG_S390) || defined(CONFIG_ARM) +static void tlb_remove_table_smp_sync(void *arg) +{ + /* Simply deliver the interrupt */ diff --git a/queue-4.19/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch b/queue-4.19/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch index 2299d7edd94..c77c683dc36 100644 --- a/queue-4.19/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch +++ b/queue-4.19/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch @@ -31,7 +31,7 @@ ptes were refactored into a common helper between 5.15 and 6.0; TLB flushing was refactored between 5.4 and 5.10; TLB flushing was refactored between 4.19 and 5.4; pmd collapse for PTE-mapped THP was only added in 5.4; -ugly hack needed in <=4.19 for s390] +ugly hack needed in <=4.19 for s390 and arm] Signed-off-by: Jann Horn Signed-off-by: Greg Kroah-Hartman --- @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman #include "internal.h" +/* gross hack for <=4.19 stable */ -+#ifdef CONFIG_S390 ++#if defined(CONFIG_S390) || defined(CONFIG_ARM) +static void tlb_remove_table_smp_sync(void *arg) +{ + /* Simply deliver the interrupt */ diff --git a/queue-4.9/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch b/queue-4.9/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch index 9f65229a1a0..dd1bb8b7d44 100644 --- a/queue-4.9/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch +++ b/queue-4.9/mm-khugepaged-fix-gup-fast-interaction-by-sending-ipi.patch @@ -31,7 +31,7 @@ ptes were refactored into a common helper between 5.15 and 6.0; TLB flushing was refactored between 5.4 and 5.10; TLB flushing was refactored between 4.19 and 5.4; pmd collapse for PTE-mapped THP was only added in 5.4; -ugly hack for s390 in <=4.19] +ugly hack for s390 in <=4.19 and arm] Signed-off-by: Jann Horn Signed-off-by: Greg Kroah-Hartman --- @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman #include "internal.h" +/* gross hack for <=4.19 stable */ -+#ifdef CONFIG_S390 ++#if defined(CONFIG_S390) || defined(CONFIG_ARM) +static void tlb_remove_table_smp_sync(void *arg) +{ + /* Simply deliver the interrupt */ -- 2.47.3