The patch titled
Subject: mm-vmstat-add-events-for-thp-migration-without-split-fix
has been removed from the -mm tree. Its filename was
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
This patch was dropped because it was folded into mm-vmstat-add-events-for-thp-migration-without-split.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-vmstat-add-events-for-thp-migration-without-split-fix
s/hpage_nr_pages/thp_nr_pages/ due to "mm: replace hpage_nr_pages with
thp_nr_pages".
Cc: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Cc: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: John Hubbard <jhubbard@xxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Zi Yan <ziy@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/migrate.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/mm/migrate.c~mm-vmstat-add-events-for-thp-migration-without-split-fix
+++ a/mm/migrate.c
@@ -1429,7 +1429,7 @@ int migrate_pages(struct list_head *from
struct page *page;
struct page *page2;
int swapwrite = current->flags & PF_SWAPWRITE;
- int rc, thp_nr_pages;
+ int rc, thp_n_pages;
if (!swapwrite)
current->flags |= PF_SWAPWRITE;
@@ -1446,7 +1446,7 @@ retry:
* during migration.
*/
is_thp = PageTransHuge(page);
- thp_nr_pages = hpage_nr_pages(page);
+ thp_n_pages = thp_nr_pages(page);
cond_resched();
if (PageHuge(page))
@@ -1483,7 +1483,7 @@ retry:
}
if (is_thp) {
nr_thp_failed++;
- nr_failed += thp_nr_pages;
+ nr_failed += thp_n_pages;
goto out;
}
nr_failed++;
@@ -1498,7 +1498,7 @@ retry:
case MIGRATEPAGE_SUCCESS:
if (is_thp) {
nr_thp_succeeded++;
- nr_succeeded += thp_nr_pages;
+ nr_succeeded += thp_n_pages;
break;
}
nr_succeeded++;
@@ -1512,7 +1512,7 @@ retry:
*/
if (is_thp) {
nr_thp_failed++;
- nr_failed += thp_nr_pages;
+ nr_failed += thp_n_pages;
break;
}
nr_failed++;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-vmstat-add-events-for-thp-migration-without-split.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.patch
mm-migrate-make-a-standard-migration-target-allocation-function-fix.patch
mm.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
