Subject: [merged] sched-numa-fix-set-cpupid-on-page-migration-twice.patch removed from -mm tree To: liwanp@xxxxxxxxxxxxxxxxxx,mgorman@xxxxxxx,mingo@xxxxxxxxxx,n-horiguchi@xxxxxxxxxxxxx,peterz@xxxxxxxxxxxxx,riel@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 24 Jan 2014 10:59:15 -0800 The patch titled Subject: sched/numa: fix setting of cpupid on page migration twice has been removed from the -mm tree. Its filename was sched-numa-fix-set-cpupid-on-page-migration-twice.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Subject: sched/numa: fix setting of cpupid on page migration twice commit 7851a45cd3 ("mm: numa: Copy cpupid on page migration") copys 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@xxxxxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/migrate.c | 2 -- 1 file changed, 2 deletions(-) diff -puN mm/migrate.c~sched-numa-fix-set-cpupid-on-page-migration-twice mm/migrate.c --- a/mm/migrate.c~sched-numa-fix-set-cpupid-on-page-migration-twice +++ a/mm/migrate.c @@ -1753,8 +1753,6 @@ int migrate_misplaced_transhuge_page(str 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); _ Patches currently in -mm which might be from liwanp@xxxxxxxxxxxxxxxxxx are origin.patch mm-remove-bug_on-from-mlock_vma_page.patch linux-next.patch mm-migratec-fix-setting-of-cpupid-on-page-migration-twice-against-normal-page.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html