From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx184.postini.com [74.125.245.184]) by kanga.kvack.org (Postfix) with SMTP id D87A56B0034 for ; Tue, 18 Jun 2013 10:31:55 -0400 (EDT) Received: by mail-pd0-f182.google.com with SMTP id r10so3952854pdi.41 for ; Tue, 18 Jun 2013 07:31:55 -0700 (PDT) Message-ID: <51C06F51.2030704@gmail.com> Date: Tue, 18 Jun 2013 22:31:45 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: [PATCH] mm, sparse: Put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , David Rientjes Cc: Linux MM , "linux-kernel@vger.kernel.org" , toshi.kani@hp.com From: Zhang Yanfei With CONFIG_MEMORY_HOTREMOVE unset, there is a compile warning: mm/sparse.c:755: warning: a??clear_hwpoisoned_pagesa?? defined but not used And Bisecting it ended up pointing to: commit 4edd7ceff0662afde195da6f6c43e7cbe1ed2dc4 Author: David Rientjes Date: Mon Apr 29 15:08:22 2013 -0700 mm, hotplug: avoid compiling memory hotremove functions when disabled __remove_pages() is only necessary for CONFIG_MEMORY_HOTREMOVE. PowerPC pseries will return -EOPNOTSUPP if unsupported. Adding an #ifdef causes several other functions it depends on to also become unnecessary, which saves in .text when disabled (it's disabled in most defconfigs besides powerpc, including x86). remove_memory_block() becomes static since it is not referenced outside of drivers/base/memory.c. Build tested on x86 and powerpc with CONFIG_MEMORY_HOTREMOVE both enabled and disabled. Signed-off-by: David Rientjes Acked-by: Toshi Kani Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Greg Kroah-Hartman Cc: Wen Congyang Cc: Tang Chen Cc: Yasuaki Ishimatsu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds This is because the commit above put function sparse_remove_one_section within the protection of CONFIG_MEMORY_HOTREMOVE but the only user of function 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 Cc: David Rientjes Cc: Toshi Kani --- mm/sparse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index 1c91f0d..999a1fe 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -751,6 +751,7 @@ out: return ret; } +#ifdef CONFIG_MEMORY_HOTREMOVE #ifdef CONFIG_MEMORY_FAILURE static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) { @@ -772,7 +773,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; -- 1.7.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org