Merge branch 'thinkpad-2.6.32-part2' into release

[cascardo/linux.git] / arch / x86 / include / asm / topology.h

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 26d06e0..6f0695d 100644 (file)
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -116,15 +116,11 @@ extern unsigned long node_remap_size[];
 
 # define SD_CACHE_NICE_TRIES   1
 # define SD_IDLE_IDX           1
-# define SD_NEWIDLE_IDX                2
-# define SD_FORKEXEC_IDX       0
 
 #else
 
 # define SD_CACHE_NICE_TRIES   2
 # define SD_IDLE_IDX           2
-# define SD_NEWIDLE_IDX                2
-# define SD_FORKEXEC_IDX       1
 
 #endif
 
@@ -137,22 +133,20 @@ extern unsigned long node_remap_size[];
        .cache_nice_tries       = SD_CACHE_NICE_TRIES,                  \
        .busy_idx               = 3,                                    \
        .idle_idx               = SD_IDLE_IDX,                          \
-       .newidle_idx            = SD_NEWIDLE_IDX,                       \
-       .wake_idx               = 1,                                    \
-       .forkexec_idx           = SD_FORKEXEC_IDX,                      \
+       .newidle_idx            = 0,                                    \
+       .wake_idx               = 0,                                    \
+       .forkexec_idx           = 0,                                    \
                                                                        \
        .flags                  = 1*SD_LOAD_BALANCE                     \
                                | 1*SD_BALANCE_NEWIDLE                  \
                                | 1*SD_BALANCE_EXEC                     \
                                | 1*SD_BALANCE_FORK                     \
-                               | 0*SD_WAKE_IDLE                        \
+                               | 0*SD_BALANCE_WAKE                     \
                                | 1*SD_WAKE_AFFINE                      \
-                               | 1*SD_WAKE_BALANCE                     \
                                | 0*SD_SHARE_CPUPOWER                   \
                                | 0*SD_POWERSAVINGS_BALANCE             \
                                | 0*SD_SHARE_PKG_RESOURCES              \
                                | 1*SD_SERIALIZE                        \
-                               | 1*SD_WAKE_IDLE_FAR                    \
                                | 0*SD_PREFER_SIBLING                   \
                                ,                                       \
        .last_balance           = jiffies,                              \