From 965d5df77124a4a8fead612950607782aa704e37 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Aug 2023 08:32:05 +0200 Subject: [PATCH] fix up queue-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch --- ...orrectly-in-gup_must_unshare-via-gup-fast.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/queue-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch b/queue-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch index 5380d22408f..857391530c5 100644 --- a/queue-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch +++ b/queue-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch @@ -125,13 +125,13 @@ Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- - mm/internal.h | 10 ++++++++++ + include/linux/mm.h | 10 ++++++++++ 1 file changed, 10 insertions(+) ---- a/mm/internal.h -+++ b/mm/internal.h -@@ -850,6 +850,16 @@ static inline bool vma_soft_dirty_enable - return false; +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -3092,6 +3092,16 @@ static inline bool gup_must_unshare(unsi + smp_rmb(); /* + * During GUP-fast we might not get called on the head page for a @@ -144,6 +144,6 @@ Signed-off-by: Greg Kroah-Hartman + page = compound_head(page); + + /* - * Soft-dirty is kind of special: its tracking is enabled when the - * vma flags not set. + * Note that PageKsm() pages cannot be exclusive, and consequently, + * cannot get pinned. */ -- 2.47.3