[folded-merged] mm-thp-calculate-the-mapcount-correctly-for-thp-pages-during-wp-faults-fix.patch removed from -mm tree

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

 



The patch titled
     Subject: mm: thp: fix build of reuse_swap_page with CONFIG_SWAP=n
has been removed from the -mm tree.  Its filename was
     mm-thp-calculate-the-mapcount-correctly-for-thp-pages-during-wp-faults-fix.patch

This patch was dropped because it was folded into mm-thp-calculate-the-mapcount-correctly-for-thp-pages-during-wp-faults.patch

------------------------------------------------------
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Subject: mm: thp: fix build of reuse_swap_page with CONFIG_SWAP=n

page_trans_huge_compound is inline defined in mm.h. reuse_swap_page is
calling page_trans_huge_compound in swap.h which included early on by
mm.h before page_trans_huge_compound is defined.

This is why reuse_swap_page was a preprocessor macro, so make it a
preprocessor macro again.

Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/swap.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff -puN include/linux/swap.h~mm-thp-calculate-the-mapcount-correctly-for-thp-pages-during-wp-faults-fix include/linux/swap.h
--- a/include/linux/swap.h~mm-thp-calculate-the-mapcount-correctly-for-thp-pages-during-wp-faults-fix
+++ a/include/linux/swap.h
@@ -513,10 +513,8 @@ static inline int swp_swapcount(swp_entr
 	return 0;
 }
 
-static inline bool reuse_swap_page(struct page *page, int *total_mapcount)
-{
-	return page_trans_huge_mapcount(page, total_mapcount) == 1;
-}
+#define reuse_swap_page(page, total_mapcount) \
+	(page_trans_huge_mapcount(page, total_mapcount) == 1)
 
 static inline int try_to_free_swap(struct page *page)
 {
_

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

mm-thp-calculate-the-mapcount-correctly-for-thp-pages-during-wp-faults.patch
mm-thp-calculate-the-mapcount-correctly-for-thp-pages-during-wp-faults-fix-2.patch
mm-thp-microoptimize-compound_mapcount.patch
mm-thp-split_huge_pmd_address-comment-improvement.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



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

  Powered by Linux