Skip to contentSkip to conversation

ia64-old_rr4-added-under-config_hugetlb_page.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jul 18, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: ia64: old_rr4 added under CONFIG_HUGETLB_PAGE
has been removed from the -mm tree. Its filename was
ia64-old_rr4-added-under-config_hugetlb_page.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Souptick Joarder (HPE)" <[email protected]>
Subject: ia64: old_rr4 added under CONFIG_HUGETLB_PAGE
Date: Sun, 26 Jun 2022 07:51:14 +0530

kernel test robot throws below warning ->

arch/ia64/include/asm/mmu_context.h: In function 'reload_context':
arch/ia64/include/asm/mmu_context.h:127:48: warning: variable
'old_rr4' set but not used [-Wunused-but-set-variable]

     127 |         unsigned long rr0, rr1, rr2, rr3, rr4, old_rr4;

Add it under CONFIG_HUGETLB_PAGE

---

 arch/ia64/include/asm/mmu_context.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/ia64/include/asm/mmu_context.h renamed from arch/ia64/include/asm/mmu_context.h~ia64-old_rr4-added-under-config_hugetlb_page +4 -1
@@ -124,9 +124,12 @@ reload_context (nv_mm_context_t context)
 {
 	unsigned long rid;
 	unsigned long rid_incr = 0;
-	unsigned long rr0, rr1, rr2, rr3, rr4, old_rr4;
+	unsigned long rr0, rr1, rr2, rr3, rr4;
 
+#ifdef CONFIG_HUGETLB_PAGE
+	unsigned long old_rr4;
 	old_rr4 = ia64_get_rr(RGN_BASE(RGN_HPAGE));
+#endif
 	rid = context << 3;	/* make space for encoding the region number */
 	rid_incr = 1 << 8;
 

_

Patches currently in -mm which might be from [email protected] are

mm-madvise-introduce-madv_collapse-sync-hugepage-collapse-fix.patch