summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-08-05 13:01:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-05 14:33:46 -0700
commit5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb (patch)
tree8b641e1dcd3ea805eca1250a50ff2e22bc58c006
parent35ad1c8803921b28541ad28bfb18dc3b6295ba98 (diff)
downloadlinux-stable-5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb.tar.gz
linux-stable-5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb.tar.bz2
linux-stable-5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb.zip
mm_init.c: avoid ifdef-inside-macro-expansion
gcc-3.2: mm/mm_init.c:77:1: directives may not be used inside a macro argument mm/mm_init.c:76:47: unterminated argument list invoking macro "mminit_dprintk" mm/mm_init.c: In function `mminit_verify_pageflags_layout': mm/mm_init.c:80: `mminit_dprintk' undeclared (first use in this function) mm/mm_init.c:80: (Each undeclared identifier is reported only once mm/mm_init.c:80: for each function it appears in.) mm/mm_init.c:80: syntax error before numeric constant Also fix a typo in a comment. Reported-by: Adrian Bunk <bunk@kernel.org> Cc: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/mm_init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/mm_init.c b/mm/mm_init.c
index c6af41ea9994..936ef2efd892 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -14,6 +14,10 @@
#ifdef CONFIG_DEBUG_MEMORY_INIT
int __meminitdata mminit_loglevel;
+#ifndef SECTIONS_SHIFT
+#define SECTIONS_SHIFT 0
+#endif
+
/* The zonelists are simply reported, validation is manual. */
void mminit_verify_zonelist(void)
{
@@ -74,11 +78,7 @@ void __init mminit_verify_pageflags_layout(void)
NR_PAGEFLAGS);
mminit_dprintk(MMINIT_TRACE, "pageflags_layout_shifts",
"Section %d Node %d Zone %d\n",
-#ifdef SECTIONS_SHIFT
SECTIONS_SHIFT,
-#else
- 0,
-#endif
NODES_SHIFT,
ZONES_SHIFT);
mminit_dprintk(MMINIT_TRACE, "pageflags_layout_offsets",