From 715fff76a518c537cfc134b361a653beaa3a08ef Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 5 Aug 2008 13:01:01 -0700
Subject: [PATCH] --- yaml --- r: 107655 b: refs/heads/master c:
 5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb h: refs/heads/master i:   107653:
 f1036adb841d843c454b31bc390bef498ace8d7d   107651:
 bb16ed7bdd2b356d744f96071f9ef085dee6f205   107647:
 f317d16e1bfa3a2087c3650eb0c06c993e3ddff9 v: v3

---
 [refs]             | 2 +-
 trunk/mm/mm_init.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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",