---

yaml --- r: 274165 b: refs/heads/master c: 590e4d8 h: refs/heads/master i: 274163: 8e8248a v: v3
git-mirror · Sep 20, 2011 · 7b6f7d7 · 7b6f7d7
1 parent 2e02a0a
commit 7b6f7d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a200d8e44649de2cbb39de95f42ad4ef5dc8dc22
+refs/heads/master: 590e4d857153c5d4cf86052cdfd42cf9b0779841
diff --git a/trunk/include/linux/topology.h b/trunk/include/linux/topology.h
@@ -201,6 +201,10 @@ int arch_update_cpu_topology(void);
 	.balance_interval	= 64,					\
 }
 
+#ifndef SD_NODES_PER_DOMAIN
+#define SD_NODES_PER_DOMAIN 16
+#endif
+
 #ifdef CONFIG_SCHED_BOOK
 #ifndef SD_BOOK_INIT
 #error Please define an appropriate SD_BOOK_INIT in include/asm/topology.h!!!

diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -6947,8 +6947,6 @@ static int __init isolated_cpu_setup(char *str)
 
 __setup("isolcpus=", isolated_cpu_setup);
 
-#define SD_NODES_PER_DOMAIN 16
-
 #ifdef CONFIG_NUMA
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -6947,8 +6947,6 @@ static int __init isolated_cpu_setup(char *str) @@
     __setup("isolcpus=", isolated_cpu_setup);
-    #define SD_NODES_PER_DOMAIN 16
     #ifdef CONFIG_NUMA
     /**
@@ Expand Down @@