summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Popple <apopple@nvidia.com>2022-07-21 12:05:52 +1000
committerakpm <akpm@linux-foundation.org>2022-07-29 18:07:18 -0700
commit65974cb9107d9c6da18cefda22f84aeabc638b16 (patch)
tree3508ebad4031570afd9ce0732b8e8ac9740ad524
parent35fcd75af3edf035638e632bb49607cc8fc3cdf4 (diff)
downloadlinux-stable-65974cb9107d9c6da18cefda22f84aeabc638b16.tar.gz
linux-stable-65974cb9107d9c6da18cefda22f84aeabc638b16.tar.bz2
linux-stable-65974cb9107d9c6da18cefda22f84aeabc638b16.zip
mm/gup.c: fix formatting in check_and_migrate_movable_page()
Commit b05a79d4377f ("mm/gup: migrate device coherent pages when pinning instead of failing") added a badly formatted if statement. Fix it. Link: https://lkml.kernel.org/r/20220721020552.1397598-2-apopple@nvidia.com Signed-off-by: Alistair Popple <apopple@nvidia.com> Reported-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--mm/gup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/gup.c b/mm/gup.c
index 364b274a10c2..c6d060dee9e0 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1980,8 +1980,8 @@ static long check_and_migrate_movable_pages(unsigned long nr_pages,
folio_nr_pages(folio));
}
- if (!list_empty(&movable_page_list) || isolation_error_count
- || coherent_pages)
+ if (!list_empty(&movable_page_list) || isolation_error_count ||
+ coherent_pages)
goto unpin_pages;
/*