Commit f3deb687 authored Jul 08, 2013 by Zhang Yanfei Committed by Linus Torvalds Jul 09, 2013

mm/sparse.c: put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE



With CONFIG_MEMORY_HOTREMOVE unset, there is a compile warning:

  mm/sparse.c:755: warning: `clear_hwpoisoned_pages' defined but not used

And Bisecting it ended up pointing to 4edd7cef ("mm, hotplug: avoid
compiling memory hotremove functions when disabled").

This is because the commit above put sparse_remove_one_section() within
the protection of CONFIG_MEMORY_HOTREMOVE but the only user of
clear_hwpoisoned_pages() is sparse_remove_one_section(), and it is not
within the protection of CONFIG_MEMORY_HOTREMOVE.

So put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE should fix
the warning.

Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 929aaf56

mm/sparse.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -753,6 +753,7 @@ out:
		return ret;
		}

		#ifdef CONFIG_MEMORY_HOTREMOVE
		#ifdef CONFIG_MEMORY_FAILURE
		static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
		{
		@@ -774,7 +775,6 @@ static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
		}
		#endif

		#ifdef CONFIG_MEMORY_HOTREMOVE
		static void free_section_usemap(struct page memmap, unsigned long usemap)
		{
		struct page *usemap_page;

Admin message