projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
[cascardo/linux.git]
/
mm
/
vmstat.c
diff --git
a/mm/vmstat.c
b/mm/vmstat.c
index
20c18b7
..
d52b13d
100644
(file)
--- 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
}
#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
#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_VM_EVENTS_COUNTERS */
};
-#endif /* CONFIG_PROC_FS || CONFIG_SYSFS */
+#endif /* CONFIG_PROC_FS || CONFIG_SYSFS
|| CONFIG_NUMA
*/
#ifdef CONFIG_PROC_FS
#ifdef CONFIG_PROC_FS