fix up mm patch in 4.9, 4.14, and 4.19

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 751d1957af91db1057db4b94cf7bfb5b6195c4ea..1b54f7163fed270d63ee5bfa08036ad2d68227bd 100644 (file)
--- 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 <jannh@google.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #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 2299d7edd94657b2a5ec1c6486951862750cc1a5..c77c683dc36571ecf9e9e09fc00d6b1ab3b81ff7 100644 (file)
--- 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 <jannh@google.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #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 9f65229a1a0c02ec1881d42c93d7c48927de48a7..dd1bb8b7d445d6753d072e18c6de9c4da2c4287f 100644 (file)
--- 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 <jannh@google.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #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 */