/spare/repo/libata-dev branch 'v2.6.13'

1 files changed, 52 insertions, 14 deletions

diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index 21cf351fd05c..399bc29729fd 100644
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -40,27 +40,61 @@
  */
 #define node_to_first_cpu(node) (__ffs(node_to_cpumask(node)))
 
+/*
+ * Determines the node for a given pci bus
+ */
+#define pcibus_to_node(bus) PCI_CONTROLLER(bus)->node
+
 void build_cpu_to_node_map(void);
 
+#define SD_CPU_INIT (struct sched_domain) {             \
+        .span                   = CPU_MASK_NONE,        \
+        .parent                 = NULL,                 \
+        .groups                 = NULL,                 \
+        .min_interval           = 1,                    \
+        .max_interval           = 4,                    \
+        .busy_factor            = 64,                   \
+        .imbalance_pct          = 125,                  \
+        .cache_hot_time         = (10*1000000),         \
+        .per_cpu_gain           = 100,                  \
+        .cache_nice_tries       = 2,                    \
+        .busy_idx               = 2,                    \
+        .idle_idx               = 1,                    \
+        .newidle_idx            = 2,                    \
+        .wake_idx               = 1,                    \
+        .forkexec_idx           = 1,                    \
+        .flags                  = SD_LOAD_BALANCE       \
+                                | SD_BALANCE_NEWIDLE    \
+                                | SD_BALANCE_EXEC       \
+                                | SD_WAKE_AFFINE,       \
+        .last_balance           = jiffies,              \
+        .balance_interval       = 1,                    \
+        .nr_balance_failed      = 0,                    \
+}
+
 /* sched_domains SD_NODE_INIT for IA64 NUMA machines */
 #define SD_NODE_INIT (struct sched_domain) {            \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
         .groups                 = NULL,                 \
-        .min_interval           = 80,                   \
-        .max_interval           = 320,                  \
-        .busy_factor            = 320,                  \
+        .min_interval           = 8,                    \
+        .max_interval           = 8*(min(num_online_cpus(), 32)), \
+        .busy_factor            = 64,                   \
         .imbalance_pct          = 125,                  \
         .cache_hot_time         = (10*1000000),         \
-        .cache_nice_tries       = 1,                    \
+        .cache_nice_tries       = 2,                    \
+        .busy_idx               = 3,                    \
+        .idle_idx               = 2,                    \
+        .newidle_idx            = 0, /* unused */       \
+        .wake_idx               = 1,                    \
+        .forkexec_idx           = 1,                    \
         .per_cpu_gain           = 100,                  \
         .flags                  = SD_LOAD_BALANCE       \
                                 | SD_BALANCE_EXEC       \
-                                | SD_BALANCE_NEWIDLE    \
-                                | SD_WAKE_IDLE          \
+                                | SD_BALANCE_FORK       \
                                 | SD_WAKE_BALANCE,      \
         .last_balance           = jiffies,              \
-        .balance_interval       = 1,                    \
+        .balance_interval       = 64,                   \
         .nr_balance_failed      = 0,                    \
 }
 
@@ -69,17 +103,21 @@ void build_cpu_to_node_map(void);
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
         .groups                 = NULL,                 \
-        .min_interval           = 80,                   \
-        .max_interval           = 320,                  \
-        .busy_factor            = 320,                  \
-        .imbalance_pct          = 125,                  \
+        .min_interval           = 64,                   \
+        .max_interval           = 64*num_online_cpus(), \
+        .busy_factor            = 128,                  \
+        .imbalance_pct          = 133,                  \
         .cache_hot_time         = (10*1000000),         \
         .cache_nice_tries       = 1,                    \
+        .busy_idx               = 3,                    \
+        .idle_idx               = 3,                    \
+        .newidle_idx            = 0, /* unused */       \
+        .wake_idx               = 0, /* unused */       \
+        .forkexec_idx           = 0, /* unused */       \
         .per_cpu_gain           = 100,                  \
-        .flags                  = SD_LOAD_BALANCE       \
-                                | SD_BALANCE_EXEC,      \
+        .flags                  = SD_LOAD_BALANCE,      \
         .last_balance           = jiffies,              \
-        .balance_interval       = 100*(63+num_online_cpus())/64,   \
+        .balance_interval       = 64,                   \
         .nr_balance_failed      = 0,                    \
 }