mm-make-pte_marker_swapin_error-more-general-fix

akpm00 · akpm00 · commit f92cedfa39ef · 2023-08-18T10:12:16.000-07:00
fix CONFIG_MMU=n build

Cc: Axel Rasmussen &lt;axelrasmussen@google.com&gt;
Cc: Peter Xu &lt;peterx@redhat.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
@@ -523,6 +523,7 @@ static inline bool mm_tlb_flush_nested(struct mm_struct *mm)
 	return atomic_read(&mm->tlb_flush_pending) > 1;
 }
 
+#ifdef CONFIG_MMU
 /*
  * Computes the pte marker to copy from the given source entry into dst_vma.
  * If no marker should be copied, returns 0.
@@ -541,6 +542,7 @@ static inline pte_marker copy_pte_marker(
 
 	return dstm;
 }
+#endif
 
 /*
  * If this pte is wr-protected by uffd-wp in any form, arm the special pte to

Original file line number	Diff line number	Diff line change
`@@ -523,6 +523,7 @@ static inline bool mm_tlb_flush_nested(struct mm_struct *mm)`
`523`	`523`	`return atomic_read(&mm->tlb_flush_pending) > 1;`
`524`	`524`	`}`
`525`	`525`
	`526`	`+#ifdef CONFIG_MMU`
`526`	`527`	`/*`
`527`	`528`	`* Computes the pte marker to copy from the given source entry into dst_vma.`
`528`	`529`	`* If no marker should be copied, returns 0.`
`@@ -541,6 +542,7 @@ static inline pte_marker copy_pte_marker(`
`541`	`542`
`542`	`543`	`return dstm;`
`543`	`544`	`}`
	`545`	`+#endif`
`544`	`546`
`545`	`547`	`/*`
`546`	`548`	`* If this pte is wr-protected by uffd-wp in any form, arm the special pte to`