From: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Date: Thu, 23 Jan 2014 23:53:21 +0000 (-0800)
Subject: sched/numa: fix setting of cpupid on page migration twice
X-Git-Tag: firefly_0821_release~176^2~4584^2~167
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=baae911b27b8dbee6830f4e3ef0fcf4dc8e9c07b;p=firefly-linux-kernel-4.4.55.git

sched/numa: fix setting of cpupid on page migration twice

Commit 7851a45cd3f6 ("mm: numa: Copy cpupid on page migration") copiess
over the cpupid at page migration time.  It is unnecessary to set it
again in migrate_misplaced_transhuge_page().

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/migrate.c b/mm/migrate.c
index 4b3996eb7f0f..734704f6f29b 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1753,8 +1753,6 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
 	if (!new_page)
 		goto out_fail;
 
-	page_cpupid_xchg_last(new_page, page_cpupid_last(page));
-
 	isolated = numamigrate_isolate_page(pgdat, page);
 	if (!isolated) {
 		put_page(new_page);