Messages in this thread Patch in this message | | | Date | Mon, 4 Aug 2008 21:19:15 +0300 | From | Adrian Bunk <> | Subject | [2.6 patch] fix mm/mm_init.c compilation |
| |
This patch fixes the following compile error with gcc 3.2:
<-- snip -->
... CC mm/mm_init.o /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/mm_init.c:77:1: directives may not be used inside a macro argument /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/mm_init.c:76:47: unterminated argument list invoking macro "mminit_dprintk" /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/mm_init.c: In function `mminit_verify_pageflags_layout': /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/mm_init.c:80: `mminit_dprintk' undeclared (first use in this function) /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/mm_init.c:80: (Each undeclared identifier is reported only once /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/mm_init.c:80: for each function it appears in.) /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/mm_init.c:80: syntax error before numeric constant make[2]: *** [mm/mm_init.o] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
mm/mm_init.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
--- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -63,6 +63,13 @@ void __init mminit_verify_pageflags_layout(void) { int shift, width; unsigned long or_mask, add_mask; + int sections_shift; + +#ifdef SECTIONS_SHIFT + sections_shift = SECTIONS_SHIFT; +#else + sections_shift = 0; +#endif shift = 8 * sizeof(unsigned long); width = shift - SECTIONS_WIDTH - NODES_WIDTH - ZONES_WIDTH; @@ -74,11 +81,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 + sections_shift, NODES_SHIFT, ZONES_SHIFT); mminit_dprintk(MMINIT_TRACE, "pageflags_layout_offsets",
| |