[folded-merged] mm-swap-stop-using-page-private-on-tail-pages-for-thp_swap-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The quilt patch titled
     Subject: fixup: mm/swap: stop using page->private on tail pages for THP_SWAP
has been removed from the -mm tree.  Its filename was
     mm-swap-stop-using-page-private-on-tail-pages-for-thp_swap-fix.patch

This patch was dropped because it was folded into mm-swap-stop-using-page-private-on-tail-pages-for-thp_swap.patch

------------------------------------------------------
From: David Hildenbrand <david@xxxxxxxxxx>
Subject: fixup: mm/swap: stop using page->private on tail pages for THP_SWAP

Per Yoshry, use folio_page_idx(). It shouldn't make a difference for
our (THP) use case, but it's certainly cleaner.

Link: https://lkml.kernel.org/r/6f0a82a3-6948-20d9-580b-be1dbf415701@xxxxxxxxxx
Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>
Reviewed-by: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/swap.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/include/linux/swap.h~mm-swap-stop-using-page-private-on-tail-pages-for-thp_swap-fix
+++ a/include/linux/swap.h
@@ -344,7 +344,7 @@ static inline swp_entry_t page_swap_entr
 	struct folio *folio = page_folio(page);
 	swp_entry_t entry = folio_swap_entry(folio);
 
-	entry.val += page - &folio->page;
+	entry.val += folio_page_idx(folio, page);
 	return entry;
 }
 
_

Patches currently in -mm which might be from david@xxxxxxxxxx are

mm-swap-stop-using-page-private-on-tail-pages-for-thp_swap.patch
mm-swap-inline-folio_set_swap_entry-and-folio_swap_entry.patch
mm-huge_memory-work-on-folio-swap-instead-of-page-private-when-splitting-folio.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux