linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / topology.h

diff --git a/include/linux/topology.h b/include/linux/topology.h
index ec1eca8..e8eb004 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -134,8 +134,7 @@
        .flags                  = SD_LOAD_BALANCE       \
                                | SD_BALANCE_NEWIDLE    \
                                | SD_BALANCE_EXEC       \
-                               | SD_WAKE_AFFINE        \
-                               | BALANCE_FOR_POWER,    \
+                               | SD_WAKE_AFFINE,       \
        .last_balance           = jiffies,              \
        .balance_interval       = 1,                    \
        .nr_balance_failed      = 0,                    \
@@ -165,15 +164,6 @@
        .nr_balance_failed      = 0,                    \
 }
 
-#ifdef CONFIG_SCHED_MC
-#ifndef SD_MC_INIT
-/* for now its same as SD_CPU_INIT.
- * TBD: Tune Domain parameters!
- */
-#define SD_MC_INIT   SD_CPU_INIT
-#endif
-#endif
-
 #ifdef CONFIG_NUMA
 #ifndef SD_NODE_INIT
 #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!