Merge tag 'v6.1.137' into orange-pi-6.1-rk35xx

khusika · khusika · commit 9715ddc68761 · 2025-06-28T06:09:43.000+07:00
This is the 6.1.137 stable release * tag 'v6.1.137' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.137 LoongArch: Fix build error due to backport Signed-off-by: Khusika Dhamar Gusti <khusikadhamar@gmail.com>
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 136
+SUBLEVEL = 137
 EXTRAVERSION =
 NAME = Curry Ramen
 
diff --git a/arch/loongarch/mm/hugetlbpage.c b/arch/loongarch/mm/hugetlbpage.c
@@ -47,7 +47,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr,
 				pmd = pmd_offset(pud, addr);
 		}
 	}
-	return pmd_none(pmdp_get(pmd)) ? NULL : (pte_t *) pmd;
+	return pmd_none(*pmd) ? NULL : (pte_t *) pmd;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ pte_t huge_pte_offset(struct mm_struct mm, unsigned long addr,`
`47`	`47`	`pmd = pmd_offset(pud, addr);`
`48`	`48`	`}`
`49`	`49`	`}`
`50`		`- return pmd_none(pmdp_get(pmd)) ? NULL : (pte_t *) pmd;`
	`50`	`+ return pmd_none(pmd) ? NULL : (pte_t ) pmd;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/*`