Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

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

diff --git a/include/linux/topology.h b/include/linux/topology.h
index da508d1998e413714ee788a4602d2a6478dba96d..a9d1f049cc151aa07202ffbc41346dc78a95d4b3 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -93,10 +93,9 @@
        .groups                 = NULL,                 \
        .min_interval           = 1,                    \
        .max_interval           = 2,                    \
-       .busy_factor            = 8,                    \
+       .busy_factor            = 64,                   \
        .imbalance_pct          = 110,                  \
        .cache_nice_tries       = 0,                    \
-       .per_cpu_gain           = 25,                   \
        .busy_idx               = 0,                    \
        .idle_idx               = 0,                    \
        .newidle_idx            = 1,                    \
@@ -128,7 +127,6 @@
        .busy_factor            = 64,                   \
        .imbalance_pct          = 125,                  \
        .cache_nice_tries       = 1,                    \
-       .per_cpu_gain           = 100,                  \
        .busy_idx               = 2,                    \
        .idle_idx               = 1,                    \
        .newidle_idx            = 2,                    \
@@ -159,7 +157,6 @@
        .busy_factor            = 64,                   \
        .imbalance_pct          = 125,                  \
        .cache_nice_tries       = 1,                    \
-       .per_cpu_gain           = 100,                  \
        .busy_idx               = 2,                    \
        .idle_idx               = 1,                    \
        .newidle_idx            = 2,                    \
@@ -193,8 +190,8 @@
        .newidle_idx            = 0, /* unused */       \
        .wake_idx               = 0, /* unused */       \
        .forkexec_idx           = 0, /* unused */       \
-       .per_cpu_gain           = 100,                  \
-       .flags                  = SD_LOAD_BALANCE,      \
+       .flags                  = SD_LOAD_BALANCE       \
+                               | SD_SERIALIZE, \
        .last_balance           = jiffies,              \
        .balance_interval       = 64,                   \
        .nr_balance_failed      = 0,                    \