Commit 0d6617c7 authored Sep 14, 2011 by David Rientjes Committed by Linus Torvalds Sep 14, 2011

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'

Introduced in commit fa25c503 ("mm: per-node vmstat: show proper
vmstats").

Define the array for CONFIG_NUMA as well.

[akpm@linux-foundation.org: remove unneeded ifdefs]
Signed-off-by: David Rientjes <rientjes@google.com>
Reported-by: Cong Wang <amwang@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2bbff6c7

mm/vmstat.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

Admin message