summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWanpeng Li <liwanp@linux.vnet.ibm.com>2014-01-27 20:07:17 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-28 00:02:40 -0500
commita3978a519461b095b776f44a86079f5448c96963 (patch)
tree63ed35793c2d0423ae7b4bac4249872dea2f3741 /mm
parentce85b4f2eab663dfd4ff2cb5b603ba03f595922e (diff)
mm/migrate.c: fix setting of cpupid on page migration twice against normal page
Commit 7851a45cd3f6 ("mm: numa: Copy cpupid on page migration") copies over the cpupid at page migration time. It is unnecessary to set it again in alloc_misplaced_dst_page(). Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Acked-by: Mel Gorman <mgorman@suse.de> 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 734704f6f29b..482a33d89134 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1548,8 +1548,6 @@ static struct page *alloc_misplaced_dst_page(struct page *page,
1548 __GFP_NOMEMALLOC | __GFP_NORETRY | 1548 __GFP_NOMEMALLOC | __GFP_NORETRY |
1549 __GFP_NOWARN) & 1549 __GFP_NOWARN) &
1550 ~GFP_IOFS, 0); 1550 ~GFP_IOFS, 0);
1551 if (newpage)
1552 page_cpupid_xchg_last(newpage, page_cpupid_last(page));
1553 1551
1554 return newpage; 1552 return newpage;
1555} 1553}