diff --git a/[refs] b/[refs] index 3b71b9f003c5..4f603a27ba8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35ad1c8803921b28541ad28bfb18dc3b6295ba98 +refs/heads/master: 5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb diff --git a/trunk/mm/mm_init.c b/trunk/mm/mm_init.c index c6af41ea9994..936ef2efd892 100644 --- a/trunk/mm/mm_init.c +++ b/trunk/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",