From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 26 Jul 2021 07:48:32 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.4.277~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31777b2556d7990ad1f78e9c2630c776767a659c;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	revert-mips-add-pmd-table-accounting-into-mips-pmd_alloc_one.patch
---

diff --git a/queue-4.19/revert-mips-add-pmd-table-accounting-into-mips-pmd_alloc_one.patch b/queue-4.19/revert-mips-add-pmd-table-accounting-into-mips-pmd_alloc_one.patch
new file mode 100644
index 00000000000..ce8f2631b3a
--- /dev/null
+++ b/queue-4.19/revert-mips-add-pmd-table-accounting-into-mips-pmd_alloc_one.patch
@@ -0,0 +1,44 @@
+From huangpei@loongson.cn  Mon Jul 26 09:44:23 2021
+From: Huang Pei <huangpei@loongson.cn>
+Date: Mon, 26 Jul 2021 15:26:42 +0800
+Subject: [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one"
+To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>, ambrosehua@gmail.com
+Cc: Bibo Mao <maobibo@loongson.cn>, stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Li Xuefeng <lixuefeng@loongson.cn>, Yang Tiezhu <yangtiezhu@loongson.cn>, Gao Juxin <gaojuxin@loongson.cn>, Huacai Chen <chenhuacai@loongson.cn>, Jinyang He <hejinyang@loongson.cn>
+Message-ID: <20210726072642.551510-2-huangpei@loongson.cn>
+
+From: Huang Pei <huangpei@loongson.cn>
+
+This reverts commit 68046cc531577b8f0ebe67ccf18b9c70106d7937 which is
+commit ed914d48b6a1040d1039d371b56273d422c0081e upstream.
+
+Commit b2b29d6d011944 (mm: account PMD tables like PTE tables) is
+introduced between v5.9 and v5.10, so this fix (commit 002d8b395fa1)
+should NOT apply to any pre-5.10 branch.
+
+Signed-off-by: Huang Pei <huangpei@loongson.cn>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/include/asm/pgalloc.h |   10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+--- a/arch/mips/include/asm/pgalloc.h
++++ b/arch/mips/include/asm/pgalloc.h
+@@ -93,15 +93,11 @@ do {							\
+ 
+ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
+ {
+-	pmd_t *pmd = NULL;
+-	struct page *pg;
++	pmd_t *pmd;
+ 
+-	pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
+-	if (pg) {
+-		pgtable_pmd_page_ctor(pg);
+-		pmd = (pmd_t *)page_address(pg);
++	pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
++	if (pmd)
+ 		pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
+-	}
+ 	return pmd;
+ }
+ 
diff --git a/queue-4.19/series b/queue-4.19/series
index 425891de98a..ae6b449c880 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -87,3 +87,4 @@ sctp-update-active_key-for-asoc-when-old-key-is-bein.patch
 net-sched-cls_api-fix-the-the-wrong-parameter.patch
 drm-panel-raspberrypi-touchscreen-prevent-double-fre.patch
 proc-avoid-mixing-integer-types-in-mem_rw.patch
+revert-mips-add-pmd-table-accounting-into-mips-pmd_alloc_one.patch