diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /mm/mm_init.c | |
| parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | kernel-crypto-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.gz kernel-crypto-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.xz kernel-crypto-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip | |
Merge commit 'v2.6.27-rc6' into timers/hpet
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 c6af41ea999..4e0e26591df 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", |