# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1427  -> 1.1428 
#	  include/linux/mm.h	1.133   -> 1.134  
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/11/06	jbarnes@tomahawk.engr.sgi.com	1.1428
# make zone_shift use nodes_shift
# --------------------------------------------
#
diff -Nru a/include/linux/mm.h b/include/linux/mm.h
--- a/include/linux/mm.h	Thu Nov  6 13:40:16 2003
+++ b/include/linux/mm.h	Thu Nov  6 13:40:16 2003
@@ -322,8 +322,10 @@
 /*
  * The zone field is never updated after free_area_init_core()
  * sets it, so none of the operations on it need to be atomic.
+ * We'll have up to log2(MAX_NUMNODES * MAX_NR_ZONES) zones
+ * total, so we use NODES_SHIFT here to get enough bits.
  */
-#define ZONE_SHIFT (BITS_PER_LONG - 8)
+#define ZONE_SHIFT (BITS_PER_LONG - (NODES_SHIFT + 2))
 
 struct zone;
 extern struct zone *zone_table[];