Skip to contentSkip to conversation

mm-swap-comment-all-the-ifdef-in-swapopsh.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/swap: comment all the ifdef in swapops.h
has been removed from the -mm tree. Its filename was
mm-swap-comment-all-the-ifdef-in-swapopsh.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: Peter Xu <[email protected]>
Subject: mm/swap: comment all the ifdef in swapops.h
Date: Thu, 11 Aug 2022 12:13:26 -0400

swapops.h contains quite a few layers of ifdef, some of the "else" and "endif" doesn't get proper comment on the macro so it's hard to follow on what are they referring to. Add the comments.

Link https://lkml.kernel.org/r/[email protected] open here
Signed-off-by Peter Xu <[email protected]>
Suggested-by Nadav Amit <[email protected]>
Reviewed-by Huang Ying <[email protected]>
Reviewed-by Alistair Popple <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc "Kirill A . Shutemov" <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Dave Hansen <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 include/linux/swapops.h |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
include/linux/swapops.h renamed from include/linux/swapops.h~mm-swap-comment-all-the-ifdef-in-swapopsh +8 -8
@@ -247,8 +247,8 @@ extern void migration_entry_wait(struct
 #ifdef CONFIG_HUGETLB_PAGE
 extern void __migration_entry_wait_huge(pte_t *ptep, spinlock_t *ptl);
 extern void migration_entry_wait_huge(struct vm_area_struct *vma, pte_t *pte);
-#endif
-#else
+#endif	/* CONFIG_HUGETLB_PAGE */
+#else  /* CONFIG_MIGRATION */
 static inline swp_entry_t make_readable_migration_entry(pgoff_t offset)
 {
 	return swp_entry(0, 0);

@@ -276,7 +276,7 @@ static inline void migration_entry_wait(
 #ifdef CONFIG_HUGETLB_PAGE
 static inline void __migration_entry_wait_huge(pte_t *ptep, spinlock_t *ptl) { }
 static inline void migration_entry_wait_huge(struct vm_area_struct *vma, pte_t *pte) { }
-#endif
+#endif	/* CONFIG_HUGETLB_PAGE */
 static inline int is_writable_migration_entry(swp_entry_t entry)
 {
 	return 0;

@@ -286,7 +286,7 @@ static inline int is_readable_migration_
 	return 0;
 }
 
-#endif
+#endif	/* CONFIG_MIGRATION */
 
 typedef unsigned long pte_marker;
 

@@ -426,7 +426,7 @@ static inline int is_pmd_migration_entry
 {
 	return is_swap_pmd(pmd) && is_migration_entry(pmd_to_swp_entry(pmd));
 }
-#else
+#else  /* CONFIG_ARCH_ENABLE_THP_MIGRATION */
 static inline int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,
 		struct page *page)
 {

@@ -455,7 +455,7 @@ static inline int is_pmd_migration_entry
 {
 	return 0;
 }
-#endif
+#endif  /* CONFIG_ARCH_ENABLE_THP_MIGRATION */
 
 #ifdef CONFIG_MEMORY_FAILURE
 

@@ -490,7 +490,7 @@ static inline void num_poisoned_pages_su
 	atomic_long_sub(i, &num_poisoned_pages);
 }
 
-#else
+#else  /* CONFIG_MEMORY_FAILURE */
 
 static inline swp_entry_t make_hwpoison_entry(struct page *page)
 {

@@ -509,7 +509,7 @@ static inline void num_poisoned_pages_in
 static inline void num_poisoned_pages_sub(long i)
 {
 }
-#endif
+#endif  /* CONFIG_MEMORY_FAILURE */
 
 static inline int non_swap_entry(swp_entry_t entry)
 {

_

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