Subject: [merged] mm-hwpoison-replace-atomic_long_sub-with-atomic_long_dec.patch removed from -mm tree To: liwanp@xxxxxxxxxxxxxxxxxx,andi@xxxxxxxxxxxxxx,n-horiguchi@xxxxxxxxxxxxx,tony.luck@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 12 Sep 2013 12:45:27 -0700 The patch titled Subject: mm/hwpoison: replace atomic_long_sub() with atomic_long_dec() has been removed from the -mm tree. Its filename was mm-hwpoison-replace-atomic_long_sub-with-atomic_long_dec.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Subject: mm/hwpoison: replace atomic_long_sub() with atomic_long_dec() Replace atomic_long_sub() with atomic_long_dec() since the page is normal page instead of hugetlbfs page or thp. Signed-off-by: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Reviewed-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory-failure.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/memory-failure.c~mm-hwpoison-replace-atomic_long_sub-with-atomic_long_dec mm/memory-failure.c --- a/mm/memory-failure.c~mm-hwpoison-replace-atomic_long_sub-with-atomic_long_dec +++ a/mm/memory-failure.c @@ -1366,7 +1366,7 @@ int unpoison_memory(unsigned long pfn) return 0; } if (TestClearPageHWPoison(p)) - atomic_long_sub(nr_pages, &num_poisoned_pages); + atomic_long_dec(&num_poisoned_pages); pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn); return 0; } _ Patches currently in -mm which might be from liwanp@xxxxxxxxxxxxxxxxxx are origin.patch mm-drop-actor-argument-of-do_generic_file_read.patch mm-drop-actor-argument-of-do_generic_file_read-fix.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