From: Greg Kroah-Hartman Date: Sat, 20 Jun 2020 07:59:44 +0000 (+0200) Subject: drop mips patch from 4.19 and 5.4 X-Git-Tag: v4.4.228~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fbaa097893113045dd629218a9052eacfbaa523;p=thirdparty%2Fkernel%2Fstable-queue.git drop mips patch from 4.19 and 5.4 --- diff --git a/queue-4.19/mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch b/queue-4.19/mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch deleted file mode 100644 index 238219ed2d5..00000000000 --- a/queue-4.19/mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a202bf71f08b3ef15356db30535e30b03cf23aec Mon Sep 17 00:00:00 2001 -From: Lichao Liu -Date: Thu, 28 May 2020 09:10:31 +0800 -Subject: MIPS: CPU_LOONGSON2EF need software to maintain cache consistency - -From: Lichao Liu - -commit a202bf71f08b3ef15356db30535e30b03cf23aec upstream. - -CPU_LOONGSON2EF need software to maintain cache consistency, -so modify the 'cpu_needs_post_dma_flush' function to return true -when the cpu type is CPU_LOONGSON2EF. - -Cc: stable@vger.kernel.org -Signed-off-by: Lichao Liu -Reviewed-by: Jiaxun Yang -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman - ---- - arch/mips/mm/dma-noncoherent.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/mips/mm/dma-noncoherent.c -+++ b/arch/mips/mm/dma-noncoherent.c -@@ -56,6 +56,7 @@ static inline bool cpu_needs_post_dma_fl - case CPU_R10000: - case CPU_R12000: - case CPU_BMIPS5000: -+ case CPU_LOONGSON2EF: - return true; - default: - /* diff --git a/queue-4.19/series b/queue-4.19/series index a1a5d36bd7d..c0c88a366ea 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -189,7 +189,6 @@ btrfs-include-non-missing-as-a-qualifier-for-the-latest_bdev.patch btrfs-send-emit-file-capabilities-after-chown.patch mm-thp-make-the-thp-mapcount-atomic-against-__split_huge_pmd_locked.patch mm-initialize-deferred-pages-with-interrupts-enabled.patch -mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch ima-fix-ima-digest-hash-table-key-calculation.patch ima-directly-assign-the-ima_default_policy-pointer-to-ima_rules.patch evm-fix-possible-memory-leak-in-evm_calc_hmac_or_hash.patch diff --git a/queue-5.4/mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch b/queue-5.4/mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch deleted file mode 100644 index 96455327726..00000000000 --- a/queue-5.4/mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a202bf71f08b3ef15356db30535e30b03cf23aec Mon Sep 17 00:00:00 2001 -From: Lichao Liu -Date: Thu, 28 May 2020 09:10:31 +0800 -Subject: MIPS: CPU_LOONGSON2EF need software to maintain cache consistency - -From: Lichao Liu - -commit a202bf71f08b3ef15356db30535e30b03cf23aec upstream. - -CPU_LOONGSON2EF need software to maintain cache consistency, -so modify the 'cpu_needs_post_dma_flush' function to return true -when the cpu type is CPU_LOONGSON2EF. - -Cc: stable@vger.kernel.org -Signed-off-by: Lichao Liu -Reviewed-by: Jiaxun Yang -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman - ---- - arch/mips/mm/dma-noncoherent.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/mips/mm/dma-noncoherent.c -+++ b/arch/mips/mm/dma-noncoherent.c -@@ -33,6 +33,7 @@ static inline bool cpu_needs_post_dma_fl - case CPU_R10000: - case CPU_R12000: - case CPU_BMIPS5000: -+ case CPU_LOONGSON2EF: - return true; - default: - /* diff --git a/queue-5.4/series b/queue-5.4/series index b9ef1ef0596..c345c7b7f93 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -168,7 +168,6 @@ btrfs-fix-space_info-bytes_may_use-underflow-during-space-cache-writeout.patch powerpc-mm-fix-conditions-to-perform-mmu-specific-management-by-blocks-on-ppc32.patch mm-thp-make-the-thp-mapcount-atomic-against-__split_huge_pmd_locked.patch mm-initialize-deferred-pages-with-interrupts-enabled.patch -mips-cpu_loongson2ef-need-software-to-maintain-cache-consistency.patch mm-pagealloc.c-call-touch_nmi_watchdog-on-max-order-boundaries-in-deferred-init.patch mm-call-cond_resched-from-deferred_init_memmap.patch ima-fix-ima-digest-hash-table-key-calculation.patch