The patch titled
Subject: mm-page_allocc-introduce-kernelcore=mirror-option-fix
has been removed from the -mm tree. Its filename was
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
This patch was dropped because it was folded into mm-page_allocc-introduce-kernelcore=mirror-option.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-page_allocc-introduce-kernelcore=mirror-option-fix
fix build with CONFIG_HAVE_MEMBLOCK_NODE_MAP=n
Reported-by: Sudeep Holla <sudeep.holla@xxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Steve Capper <steve.capper@xxxxxxxxxx>
Cc: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Cc: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/page_alloc.c~mm-page_allocc-introduce-kernelcore=mirror-option-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-page_allocc-introduce-kernelcore=mirror-option-fix
+++ a/mm/page_alloc.c
@@ -4521,6 +4521,7 @@ void __meminit memmap_init_zone(unsigned
&nr_initialised))
break;
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
/*
* if not mirrored_kernelcore and ZONE_MOVABLE exists,
* range from zone_movable_pfn[nid] to end of each node
@@ -4531,7 +4532,6 @@ void __meminit memmap_init_zone(unsigned
pfn >= zone_movable_pfn[nid])
continue;
-#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
/*
* check given memblock attribute by firmware which
* can affect kernel memory layout.
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
mm-simplify-lock_page_memcg-fix.patch
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-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
