Commit fe03025d authored Jul 31, 2012 by Rabin Vincent Committed by Linus Torvalds Jul 31, 2012

mm: CONFIG_HAVE_MEMBLOCK_NODE -> CONFIG_HAVE_MEMBLOCK_NODE_MAP



0ee332c1 ("memblock: Kill early_node_map[]") wanted to replace
CONFIG_ARCH_POPULATES_NODE_MAP with CONFIG_HAVE_MEMBLOCK_NODE_MAP but
ended up replacing one occurence with a reference to the non-existent
symbol CONFIG_HAVE_MEMBLOCK_NODE.

The resulting omission of code would probably have been causing problems
to 32-bit machines with memory hotplug.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 7db8889a

include/linux/mmzone.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -776,7 +776,7 @@ extern int movable_zone;

		static inline int zone_movable_is_highmem(void)
		{
		#if defined(CONFIG_HIGHMEM) && defined(CONFIG_HAVE_MEMBLOCK_NODE)
		#if defined(CONFIG_HIGHMEM) && defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP)
		return movable_zone == ZONE_HIGHMEM;
		#else
		return 0;

Admin message