From e92854d9b653353b3185d2705f171a41e66ba955 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Tue, 27 Nov 2012 10:31:44 +0000 Subject: [PATCH] --- yaml --- r: 344817 b: refs/heads/master c: 7548341b28956ccd35a63ab12f01d8541041aa70 h: refs/heads/master i: 344815: 3cfe50c1cd11d3854811702a2bcef4e5c4229108 v: v3 --- [refs] | 2 +- trunk/mm/migrate.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 51fba26a9dad..6f7ccbb4a632 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 220018d388b8ab1fca1c5f0c6474bab47ad2c9c0 +refs/heads/master: 7548341b28956ccd35a63ab12f01d8541041aa70 diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index 9341a501d168..26537c4f3094 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -1635,12 +1635,15 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, new_page = alloc_pages_node(node, (GFP_TRANSHUGE | GFP_THISNODE) & ~__GFP_WAIT, HPAGE_PMD_ORDER); - if (!new_page) + if (!new_page) { + count_vm_events(PGMIGRATE_FAIL, HPAGE_PMD_NR); goto out_dropref; + } page_xchg_last_nid(new_page, page_last_nid(page)); isolated = numamigrate_isolate_page(pgdat, page); if (!isolated) { + count_vm_events(PGMIGRATE_FAIL, HPAGE_PMD_NR); put_page(new_page); goto out_keep_locked; }