diff options
author | Dave Airlie <airlied@redhat.com> | 2022-11-24 02:05:43 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2022-11-24 02:05:43 +0100 |
commit | d47f9580839eb6fe568e38b2084d94887fbf5ce0 (patch) | |
tree | 2493555057f8e5c850590d7438fdbf4472666201 /mm/migrate.c | |
parent | Merge tag 'drm-intel-next-2022-11-18' of git://anongit.freedesktop.org/drm/dr... (diff) | |
parent | Linux 6.1-rc6 (diff) | |
download | linux-d47f9580839eb6fe568e38b2084d94887fbf5ce0.tar.xz linux-d47f9580839eb6fe568e38b2084d94887fbf5ce0.zip |
Backmerge tag 'v6.1-rc6' into drm-next
Linux 6.1-rc6
This is needed for drm-misc-next and tegra.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'mm/migrate.c')
-rw-r--r-- | mm/migrate.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 1379e1912772..dff333593a8a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1582,6 +1582,13 @@ out: */ list_splice(&ret_pages, from); + /* + * Return 0 in case all subpages of fail-to-migrate THPs are + * migrated successfully. + */ + if (list_empty(from)) + rc = 0; + count_vm_events(PGMIGRATE_SUCCESS, nr_succeeded); count_vm_events(PGMIGRATE_FAIL, nr_failed_pages); count_vm_events(THP_MIGRATION_SUCCESS, nr_thp_succeeded); |