From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 5 May 2025 08:57:10 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.137~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e0bd6254993d75d2306bdb0a147db55bdd586ee;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	loongarch-fix-build-error-due-to-backport.patch
	series
---

diff --git a/queue-6.1/loongarch-fix-build-error-due-to-backport.patch b/queue-6.1/loongarch-fix-build-error-due-to-backport.patch
new file mode 100644
index 0000000000..9b87fc1d1f
--- /dev/null
+++ b/queue-6.1/loongarch-fix-build-error-due-to-backport.patch
@@ -0,0 +1,38 @@
+From chenhuacai@loongson.cn  Mon May  5 10:55:39 2025
+From: Huacai Chen <chenhuacai@loongson.cn>
+Date: Sun,  4 May 2025 10:10:54 +0800
+Subject: LoongArch: Fix build error due to backport
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org>, Huacai Chen <chenhuacai@kernel.org>
+Cc: Xuerui Wang <kernel@xen0n.name>, stable@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Huacai Chen <chenhuacai@loongson.cn>
+Message-ID: <20250504021054.783045-1-chenhuacai@loongson.cn>
+
+From: Huacai Chen <chenhuacai@loongson.cn>
+
+In 6.1 there is no pmdp_get() definition, so use *pmd directly, in order
+to avoid such build error due to a recently backport:
+
+arch/loongarch/mm/hugetlbpage.c: In function 'huge_pte_offset':
+arch/loongarch/mm/hugetlbpage.c:50:25: error: implicit declaration of function 'pmdp_get'; did you mean 'ptep_get'?  [-Wimplicit-function-declaration]
+   50 |         return pmd_none(pmdp_get(pmd)) ? NULL : (pte_t *) pmd;
+      |                         ^~~~~~~~
+      |                         ptep_get
+
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/f978ec9a-b103-40af-b116-6a9238197110@roeck-us.net
+Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/loongarch/mm/hugetlbpage.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/loongarch/mm/hugetlbpage.c
++++ b/arch/loongarch/mm/hugetlbpage.c
+@@ -47,7 +47,7 @@ pte_t *huge_pte_offset(struct mm_struct
+ 				pmd = pmd_offset(pud, addr);
+ 		}
+ 	}
+-	return pmd_none(pmdp_get(pmd)) ? NULL : (pte_t *) pmd;
++	return pmd_none(*pmd) ? NULL : (pte_t *) pmd;
+ }
+ 
+ /*
diff --git a/queue-6.1/series b/queue-6.1/series
new file mode 100644
index 0000000000..cbb6b34eba
--- /dev/null
+++ b/queue-6.1/series
@@ -0,0 +1 @@
+loongarch-fix-build-error-due-to-backport.patch