From 50600cb1bda73438b0fab3d86c039e1643fef8a5 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Thu, 7 Jul 2005 17:56:39 -0700
Subject: [PATCH] --- yaml --- r: 4248 b: refs/heads/master c:
 8ff8b27bb8ebfd863b49653da1b7bbd8609fcd7e h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-i386/mmzone.h | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ec29f3c42308..de4c48856565 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b520b238e018ef0e9d11c9115d5e7d9419c4ef9
+refs/heads/master: 8ff8b27bb8ebfd863b49653da1b7bbd8609fcd7e
diff --git a/trunk/include/asm-i386/mmzone.h b/trunk/include/asm-i386/mmzone.h
index 33ce5d37e894..08e3cfd86328 100644
--- a/trunk/include/asm-i386/mmzone.h
+++ b/trunk/include/asm-i386/mmzone.h
@@ -8,20 +8,15 @@
 
 #include <asm/smp.h>
 
-#if CONFIG_NUMA
+#ifdef CONFIG_NUMA
 extern struct pglist_data *node_data[];
 #define NODE_DATA(nid)	(node_data[nid])
 
-#ifdef CONFIG_NUMA
-	#ifdef CONFIG_X86_NUMAQ
-		#include <asm/numaq.h>
-	#else	/* summit or generic arch */
-		#include <asm/srat.h>
-	#endif
-#else /* !CONFIG_NUMA */
-	#define get_memcfg_numa get_memcfg_numa_flat
-	#define get_zholes_size(n) (0)
-#endif /* CONFIG_NUMA */
+#ifdef CONFIG_X86_NUMAQ
+	#include <asm/numaq.h>
+#else	/* summit or generic arch */
+	#include <asm/srat.h>
+#endif
 
 extern int get_memcfg_numa_flat(void );
 /*
@@ -42,6 +37,9 @@ static inline void get_memcfg_numa(void)
 	get_memcfg_numa_flat();
 }
 
+#else /* !CONFIG_NUMA */
+#define get_memcfg_numa get_memcfg_numa_flat
+#define get_zholes_size(n) (0)
 #endif /* CONFIG_NUMA */
 
 #ifdef CONFIG_DISCONTIGMEM