From: Christoph Lameter <clameter@sgi.com>

Ensure that ZONEID_PGSHIFT is set even if ZONES_WIDTH is 0.

Andy needs to review this.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/mm.h |    5 +++++
 1 file changed, 5 insertions(+)

diff -puN include/linux/mm.h~get-rid-of-zone_table-fix-3 include/linux/mm.h
--- a/include/linux/mm.h~get-rid-of-zone_table-fix-3
+++ a/include/linux/mm.h
@@ -419,7 +419,12 @@ void split_page(struct page *page, unsig
 #else
 #define ZONEID_SHIFT		(NODES_SHIFT + ZONES_SHIFT)
 #endif
+
+#if ZONES_WIDTH > 0
 #define ZONEID_PGSHIFT		ZONES_PGSHIFT
+#else
+#define ZONEID_PGSHIFT		NODES_PGOFF
+#endif
 
 #if SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > FLAGS_RESERVED
 #error SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > FLAGS_RESERVED
_