diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-24 10:31:34 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-24 10:31:34 +0200 |
commit | e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30 (patch) | |
tree | 77926550ac0c31b1423bcf193a4ed0ecb7fda2c1 /mm/mm_init.c | |
parent | d4738792fb86600b6cb7220459d9c47e819b3580 (diff) | |
parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
download | lwn-e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30.tar.gz lwn-e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30.zip |
Merge commit 'v2.6.27-rc7' into x86/microcode
Diffstat (limited to 'mm/mm_init.c')
-rw-r--r-- | mm/mm_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/mm_init.c b/mm/mm_init.c index c6af41ea9994..4e0e26591dfa 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -12,7 +12,11 @@ #include "internal.h" #ifdef CONFIG_DEBUG_MEMORY_INIT -int __meminitdata mminit_loglevel; +int 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", |