Skip to contentSkip to conversation

mm-mlock-drop-dead-code-in-count_mm_mlocked_page_nr.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Sep 27, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/mlock: drop dead code in count_mm_mlocked_page_nr()
has been removed from the -mm tree. Its filename was
mm-mlock-drop-dead-code-in-count_mm_mlocked_page_nr.patch

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

------------------------------------------------------
From: Liam Howlett <[email protected]>
Subject: mm/mlock: drop dead code in count_mm_mlocked_page_nr()
Date: Wed, 15 Jun 2022 17:40:58 +0000

The check for mm being null has never been needed since the only caller has always passed in current->mm. Remove the check from count_mm_mlocked_page_nr().

---

 mm/mlock.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mm/mlock.c renamed from mm/mlock.c~mm-mlock-drop-dead-code-in-count_mm_mlocked_page_nr +1 -3
@@ -531,14 +531,12 @@ static unsigned long count_mm_mlocked_pa
 	unsigned long end;
 	VMA_ITERATOR(vmi, mm, start);
 
-	if (mm == NULL)
-		mm = current->mm;
-
 	/* Don't overflow past ULONG_MAX */
 	if (unlikely(ULONG_MAX - len < start))
 		end = ULONG_MAX;
 	else
 		end = start + len;
+
 	for_each_vma_range(vmi, vma, end) {
 		if (vma->vm_flags & VM_LOCKED) {
 			if (start > vma->vm_start)

_

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