diff -Naurp -X /home/jbarnes/dontdiff 040-timer-interrupt-additions.patch/include/asm-ia64/mmzone.h 050-max-nr-memblks-increase.patch/include/asm-ia64/mmzone.h
--- 040-timer-interrupt-additions.patch/include/asm-ia64/mmzone.h	Wed Dec 17 19:00:01 2003
+++ 050-max-nr-memblks-increase.patch/include/asm-ia64/mmzone.h	Tue Dec 30 15:12:54 2003
@@ -27,6 +27,8 @@
 # define NR_MEMBLKS		(NR_NODES)
 #endif
 
+#define MAX_NR_MEMBLKS		NR_MEMBLKS
+
 extern unsigned long max_low_pfn;
 
 #define pfn_valid(pfn)		(((pfn) < max_low_pfn) && ia64_pfn_valid(pfn))
diff -Naurp -X /home/jbarnes/dontdiff 040-timer-interrupt-additions.patch/include/linux/mmzone.h 050-max-nr-memblks-increase.patch/include/linux/mmzone.h
--- 040-timer-interrupt-additions.patch/include/linux/mmzone.h	Tue Dec 30 15:11:11 2003
+++ 050-max-nr-memblks-increase.patch/include/linux/mmzone.h	Tue Dec 30 15:12:54 2003
@@ -288,12 +288,6 @@ struct file;
 int min_free_kbytes_sysctl_handler(struct ctl_table *, int, struct file *, 
 					  void *, size_t *);
 
-#ifdef CONFIG_NUMA
-#define MAX_NR_MEMBLKS	BITS_PER_LONG /* Max number of Memory Blocks */
-#else /* !CONFIG_NUMA */
-#define MAX_NR_MEMBLKS	1
-#endif /* CONFIG_NUMA */
-
 #include <linux/topology.h>
 /* Returns the number of the current Node. */
 #define numa_node_id()		(cpu_to_node(smp_processor_id()))
@@ -324,6 +318,14 @@ extern struct pglist_data contig_page_da
 
 #endif /* !CONFIG_DISCONTIGMEM */
 
+#ifdef CONFIG_NUMA
+#ifndef MAX_NR_MEMBLKS
+#define MAX_NR_MEMBLKS	BITS_PER_LONG /* Max number of Memory Blocks */
+#endif
+#else /* !CONFIG_NUMA */
+#define MAX_NR_MEMBLKS	1
+#endif /* CONFIG_NUMA */
+
 #if NODES_SHIFT > MAX_NODES_SHIFT
 #error NODES_SHIFT > MAX_NODES_SHIFT
 #endif