aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWanpeng Li <liwanp@linux.vnet.ibm.com>2014-01-23 18:53:21 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 19:36:52 -0500
commitbaae911b27b8dbee6830f4e3ef0fcf4dc8e9c07b (patch)
tree62613c68782e345d16d8a170dc12884f853e8231 /mm
parentc980e66a556659f14da2294e1fc696e1352b5d00 (diff)
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/migrate.c2
1 files changed, 0 insertions, 2 deletions
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,
1753 if (!new_page) 1753 if (!new_page)
1754 goto out_fail; 1754 goto out_fail;
1755 1755
1756 page_cpupid_xchg_last(new_page, page_cpupid_last(page));
1757
1758 isolated = numamigrate_isolate_page(pgdat, page); 1756 isolated = numamigrate_isolate_page(pgdat, page);
1759 if (!isolated) { 1757 if (!isolated) {
1760 put_page(new_page); 1758 put_page(new_page);