From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded-merged] memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix.patch removed from -mm tree Date: Tue, 11 Dec 2012 15:39:10 -0800 Message-ID: <20121211233911.3F045200057@hpza10.eem.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-lb0-f202.google.com ([209.85.217.202]:33598 "EHLO mail-lb0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753759Ab2LKXjP (ORCPT ); Tue, 11 Dec 2012 18:39:15 -0500 Received: by mail-lb0-f202.google.com with SMTP id s4so2754lbc.1 for ; Tue, 11 Dec 2012 15:39:14 -0800 (PST) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, benh@kernel.crashing.org, cl@linux.com, dave@linux.vnet.ibm.com, isimatu.yasuaki@jp.fujitsu.com, kosaki.motohiro@jp.fujitsu.com, len.brown@intel.com, liuj97@gmail.com, mel@csn.ul.ie, minchan.kim@gmail.com, paulus@samba.org, rientjes@google.com, wency@cn.fujitsu.com, mm-commits@vger.kernel.org The patch titled Subject: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix has been removed from the -mm tree. Its filename was memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix.patch This patch was dropped because it was folded into memory-hotplug-update-mce_bad_pages-when-removing-the-memory.patch ------------------------------------------------------ From: Andrew Morton Subject: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix cleanup ifdefs Cc: Benjamin Herrenschmidt Cc: Christoph Lameter Cc: Dave Hansen Cc: David Rientjes Cc: Jiang Liu Cc: KOSAKI Motohiro Cc: Len Brown Cc: Minchan Kim Cc: Paul Mackerras Cc: Wen Congyang Cc: Yasuaki Ishimatsu Cc: Mel Gorman Signed-off-by: Andrew Morton --- mm/sparse.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN mm/sparse.c~memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix mm/sparse.c --- a/mm/sparse.c~memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix +++ a/mm/sparse.c @@ -786,6 +786,10 @@ static void clear_hwpoisoned_pages(struc } } } +#else +static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) +{ +} #endif void sparse_remove_one_section(struct zone *zone, struct mem_section *ms) @@ -801,10 +805,7 @@ void sparse_remove_one_section(struct zo ms->pageblock_flags = NULL; } -#ifdef CONFIG_MEMORY_FAILURE clear_hwpoisoned_pages(memmap, PAGES_PER_SECTION); -#endif - free_section_usemap(memmap, usemap); } #endif _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-introduce-mm_find_pmd.patch memory-hotplug-update-mce_bad_pages-when-removing-the-memory.patch slub-hotplug-ignore-unrelated-nodes-hot-adding-and-hot-removing.patch mmvmscan-only-evict-file-pages-when-we-have-plenty-fix.patch dmapool-make-dmapool_debug-detect-corruption-of-free-marker-fix.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix-fix-checkpatch-fixes.patch mm-check-rb_subtree_gap-correctness-fix.patch mm-rearrange-vm_area_struct-for-fewer-cache-misses-checkpatch-fixes.patch mm-vm_unmapped_area-lookup-function-checkpatch-fixes.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-i386-architecture-fix.patch mm-use-vm_unmapped_area-on-mips-architecture-fix.patch mm-use-vm_unmapped_area-on-arm-architecture-fix.patch mm-use-vm_unmapped_area-on-arm-architecture-fix-fix.patch mm-use-vm_unmapped_area-on-sh-architecture-fix.patch mm-use-vm_unmapped_area-on-sparc32-architecture-fix.patch mm-use-vm_unmapped_area-on-sparc32-architecture-fix-fix.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-tile-architecture-fix.patch mm-use-vm_unmapped_area-on-sparc64-architecture-fix.patch arch-sparc-kernel-sys_sparc_64c-s-colour-color.patch mm-introduce-a-common-interface-for-balloon-pages-mobility-mm-fix-balloon_page_movable-page-flags-check-fix.patch virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix.patch virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix-fix.patch mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix.patch bootmem-fix-wrong-call-parameter-for-free_bootmem-fix.patch mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix.patch