Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

16822e62 · Linus Torvalds · a39451c1 · e608a807 · 16822e62
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

include/asm-ia64/mmzone.h include/asm-ia64/mmzone.h +2 -2

未找到文件。
--- a/include/asm-ia64/mmzone.h
+++ b/include/asm-ia64/mmzone.h
@@ -15,6 +15,8 @@
 #include <asm/page.h>
 #include <asm/meminit.h>

+#ifdef CONFIG_DISCONTIGMEM
+
 static inline int pfn_to_nid(unsigned long pfn)
 {
 #ifdef CONFIG_NUMA
@@ -29,8 +31,6 @@ static inline int pfn_to_nid(unsigned long pfn)
 #endif
 }

-#ifdef CONFIG_DISCONTIGMEM
-
 #ifdef CONFIG_IA64_DIG /* DIG systems are small */
 # define MAX_PHYSNODE_ID	8
 # define NR_NODE_MEMBLKS	(MAX_NUMNODES * 8)