From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752549Ab1HYFzQ (ORCPT ); Thu, 25 Aug 2011 01:55:16 -0400 Received: from smtp-out.google.com ([74.125.121.67]:51382 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313Ab1HYFzK (ORCPT ); Thu, 25 Aug 2011 01:55:10 -0400 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=dkim-signature:date:from:x-x-sender:to:cc:subject: in-reply-to:message-id:references:user-agent:mime-version:content-type:x-system-of-record; b=SXyyM520SQuMXW05B6o56+fq2DOyG6iYNemgsssg5Dce8s/N2XJ/MqYCixxF5y3uM KU6LqaoVJpFqfrEAd+8sQ== Date: Wed, 24 Aug 2011 22:55:02 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Andrew Morton , Cong Wang cc: Randy Dunlap , Stephen Rothwell , Greg Kroah-Hartman , linux-next@vger.kernel.org, LKML , linux-mm@kvack.org Subject: [patch] numa: fix NUMA compile error when sysfs and procfs are disabled In-Reply-To: <4E55C221.8080100@redhat.com> Message-ID: References: <20110804145834.3b1d92a9eeb8357deb84bf83@canb.auug.org.au> <20110804152211.ea10e3e7.rdunlap@xenotime.net> <20110823143912.0691d442.akpm@linux-foundation.org> <4E547155.8090709@redhat.com> <20110824191430.8a908e70.rdunlap@xenotime.net> <4E55C221.8080100@redhat.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 25 Aug 2011, Cong Wang wrote: > Ah, this is because I missed the part in include/linux/node.h. :) > > Below is the updated version. > I've never had a problem building a kernel with CONFIG_NUMA=y and CONFIG_SYSFS=n since most of drivers/base/node.c is just an abstraction that calls into sysfs functions that will be no-ops in such a configuration. The error you cite in a different thread (http://marc.info/?l=linux-mm&m=131098795024186) about an undefined reference to vmstat_text is because you have CONFIG_NUMA enabled and both CONFIG_SYSFS and CONFIG_PROC_FS disabled and we only define vmstat_text for those fs configurations since that's the only way these strings were ever emitted before per-node vmstat. The correct fix is to define the array for CONFIG_NUMA as well. numa: fix NUMA compile error when sysfs and procfs are disabled The vmstat_text array is only defined for CONFIG_SYSFS or CONFIG_PROC_FS, yet it is referenced for per-node vmstat with CONFIG_NUMA: drivers/built-in.o: In function `node_read_vmstat': node.c:(.text+0x1106df): undefined reference to `vmstat_text' in fa25c503dfa2 (mm: per-node vmstat: show proper vmstats). Define the array for CONFIG_NUMA as well. Reported-by: Cong Wang Signed-off-by: David Rientjes --- include/linux/vmstat.h | 2 ++ mm/vmstat.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -258,6 +258,8 @@ static inline void refresh_zone_stat_thresholds(void) { } #endif /* CONFIG_SMP */ +#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) || defined(CONFIG_NUMA) extern const char * const vmstat_text[]; +#endif #endif /* _LINUX_VMSTAT_H */ diff --git a/mm/vmstat.c b/mm/vmstat.c --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -659,7 +659,7 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat, } #endif -#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) +#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) || defined(CONFIG_NUMA) #ifdef CONFIG_ZONE_DMA #define TEXT_FOR_DMA(xx) xx "_dma", #else @@ -788,7 +788,7 @@ const char * const vmstat_text[] = { #endif /* CONFIG_VM_EVENTS_COUNTERS */ }; -#endif /* CONFIG_PROC_FS || CONFIG_SYSFS */ +#endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA */ #ifdef CONFIG_PROC_FS From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Rientjes Subject: [patch] numa: fix NUMA compile error when sysfs and procfs are disabled Date: Wed, 24 Aug 2011 22:55:02 -0700 (PDT) Message-ID: References: <20110804145834.3b1d92a9eeb8357deb84bf83@canb.auug.org.au> <20110804152211.ea10e3e7.rdunlap@xenotime.net> <20110823143912.0691d442.akpm@linux-foundation.org> <4E547155.8090709@redhat.com> <20110824191430.8a908e70.rdunlap@xenotime.net> <4E55C221.8080100@redhat.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: In-Reply-To: <4E55C221.8080100@redhat.com> Sender: owner-linux-mm@kvack.org To: Andrew Morton , Cong Wang Cc: Randy Dunlap , Stephen Rothwell , Greg Kroah-Hartman , linux-next@vger.kernel.org, LKML , linux-mm@kvack.org List-Id: linux-next.vger.kernel.org On Thu, 25 Aug 2011, Cong Wang wrote: > Ah, this is because I missed the part in include/linux/node.h. :) > > Below is the updated version. > I've never had a problem building a kernel with CONFIG_NUMA=y and CONFIG_SYSFS=n since most of drivers/base/node.c is just an abstraction that calls into sysfs functions that will be no-ops in such a configuration. The error you cite in a different thread (http://marc.info/?l=linux-mm&m=131098795024186) about an undefined reference to vmstat_text is because you have CONFIG_NUMA enabled and both CONFIG_SYSFS and CONFIG_PROC_FS disabled and we only define vmstat_text for those fs configurations since that's the only way these strings were ever emitted before per-node vmstat. The correct fix is to define the array for CONFIG_NUMA as well. numa: fix NUMA compile error when sysfs and procfs are disabled The vmstat_text array is only defined for CONFIG_SYSFS or CONFIG_PROC_FS, yet it is referenced for per-node vmstat with CONFIG_NUMA: drivers/built-in.o: In function `node_read_vmstat': node.c:(.text+0x1106df): undefined reference to `vmstat_text' in fa25c503dfa2 (mm: per-node vmstat: show proper vmstats). Define the array for CONFIG_NUMA as well. Reported-by: Cong Wang Signed-off-by: David Rientjes --- include/linux/vmstat.h | 2 ++ mm/vmstat.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -258,6 +258,8 @@ static inline void refresh_zone_stat_thresholds(void) { } #endif /* CONFIG_SMP */ +#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) || defined(CONFIG_NUMA) extern const char * const vmstat_text[]; +#endif #endif /* _LINUX_VMSTAT_H */ diff --git a/mm/vmstat.c b/mm/vmstat.c --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -659,7 +659,7 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat, } #endif -#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) +#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) || defined(CONFIG_NUMA) #ifdef CONFIG_ZONE_DMA #define TEXT_FOR_DMA(xx) xx "_dma", #else @@ -788,7 +788,7 @@ const char * const vmstat_text[] = { #endif /* CONFIG_VM_EVENTS_COUNTERS */ }; -#endif /* CONFIG_PROC_FS || CONFIG_SYSFS */ +#endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA */ #ifdef CONFIG_PROC_FS -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org