shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6.1.137 into android14-6.1-lts

Browse Source 
Changes in 6.1.137
	LoongArch: Fix build error due to backport
	Linux 6.1.137

Change-Id: I5732c2bb8a70a90bfa0bbed6a0eb6c0ddae4a7eb
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-05-06 07:04:20 +00:00
parent 3b32124339 ac7079a42e
commit a70a8dc18f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 6 VERSION = 6
PATCHLEVEL = 1 PATCHLEVEL = 1
SUBLEVEL = 136 SUBLEVEL = 137
EXTRAVERSION = EXTRAVERSION =
NAME = Curry Ramen NAME = Curry Ramen

2
arch/loongarch/mm/hugetlbpage.c
View File

@@ -47,7 +47,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr,
pmd = pmd_offset(pud, addr); pmd = pmd_offset(pud, addr);
} }
} }
return pmd_none(pmdp_get(pmd)) ? NULL : (pte_t *) pmd; return pmd_none(*pmd) ? NULL : (pte_t *) pmd;
} }
/* /*