Skip to contentSkip to conversation

mm-remove-unused-stub-for-can_swapin_thp.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Oct 17, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: remove unused stub for can_swapin_thp()
has been removed from the -mm tree. Its filename was
mm-remove-unused-stub-for-can_swapin_thp.patch

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

------------------------------------------------------
From: Andy Shevchenko <[email protected]>
Subject: mm: remove unused stub for can_swapin_thp()
Date: Tue, 8 Oct 2024 22:13:29 +0300

When can_swapin_thp() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y:

mm/memory.c:4184:20: error: unused function 'can_swapin_thp' [-Werror,-Wunused-function]

Fix this by removing the unused stub.

See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").

Fixes 242d12c98174 ("mm: support large folios swap-in for sync io devices")
Cc Bill Wendling <[email protected]>
Cc Chuanhua Han <[email protected]>
Cc Justin Stitt <[email protected]>
Cc Nathan Chancellor <[email protected]>
Cc Nick Desaulniers <[email protected]>

---

 mm/memory.c |    5 -----
 1 file changed, 5 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-remove-unused-stub-for-can_swapin_thp +0 -5
@@ -4181,11 +4181,6 @@ fallback:
 	return __alloc_swap_folio(vmf);
 }
 #else /* !CONFIG_TRANSPARENT_HUGEPAGE */
-static inline bool can_swapin_thp(struct vm_fault *vmf, pte_t *ptep, int nr_pages)
-{
-	return false;
-}
-
 static struct folio *alloc_swap_folio(struct vm_fault *vmf)
 {
 	return __alloc_swap_folio(vmf);

_

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

x86-percpu-fix-clang-warning-when-dealing-with-unsigned-types.patch percpu-add-a-test-case-for-the-specific-64-bit-value-addition.patch resource-replace-open-coded-resource_intersection.patch resource-introduce-is_type_match-helper-and-use-it.patch