USB: audio: guard kernel-only code with __KERNEL__

[safe/jmp/linux-2.6] / include / linux / topology.h

diff --git a/include/linux/topology.h b/include/linux/topology.h
index fef5704..809b26c 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -95,7 +95,7 @@ int arch_update_cpu_topology(void);
                                | 1*SD_BALANCE_NEWIDLE                  \
                                | 1*SD_BALANCE_EXEC                     \
                                | 1*SD_BALANCE_FORK                     \
-                               | 1*SD_BALANCE_WAKE                     \
+                               | 0*SD_BALANCE_WAKE                     \
                                | 1*SD_WAKE_AFFINE                      \
                                | 1*SD_SHARE_CPUPOWER                   \
                                | 0*SD_POWERSAVINGS_BALANCE             \
@@ -121,14 +121,15 @@ int arch_update_cpu_topology(void);
        .cache_nice_tries       = 1,                                    \
        .busy_idx               = 2,                                    \
        .wake_idx               = 0,                                    \
-       .forkexec_idx           = 1,                                    \
+       .forkexec_idx           = 0,                                    \
                                                                        \
        .flags                  = 1*SD_LOAD_BALANCE                     \
                                | 1*SD_BALANCE_NEWIDLE                  \
                                | 1*SD_BALANCE_EXEC                     \
                                | 1*SD_BALANCE_FORK                     \
-                               | 1*SD_BALANCE_WAKE                     \
+                               | 0*SD_BALANCE_WAKE                     \
                                | 1*SD_WAKE_AFFINE                      \
+                               | 1*SD_PREFER_LOCAL                     \
                                | 0*SD_SHARE_CPUPOWER                   \
                                | 1*SD_SHARE_PKG_RESOURCES              \
                                | 0*SD_SERIALIZE                        \
@@ -151,16 +152,17 @@ int arch_update_cpu_topology(void);
        .cache_nice_tries       = 1,                                    \
        .busy_idx               = 2,                                    \
        .idle_idx               = 1,                                    \
-       .newidle_idx            = 2,                                    \
+       .newidle_idx            = 0,                                    \
        .wake_idx               = 0,                                    \
-       .forkexec_idx           = 1,                                    \
+       .forkexec_idx           = 0,                                    \
                                                                        \
        .flags                  = 1*SD_LOAD_BALANCE                     \
                                | 1*SD_BALANCE_NEWIDLE                  \
                                | 1*SD_BALANCE_EXEC                     \
                                | 1*SD_BALANCE_FORK                     \
-                               | 1*SD_BALANCE_WAKE                     \
-                               | 0*SD_WAKE_AFFINE                      \
+                               | 0*SD_BALANCE_WAKE                     \
+                               | 1*SD_WAKE_AFFINE                      \
+                               | 1*SD_PREFER_LOCAL                     \
                                | 0*SD_SHARE_CPUPOWER                   \
                                | 0*SD_SHARE_PKG_RESOURCES              \
                                | 0*SD_SERIALIZE                        \
@@ -186,7 +188,7 @@ int arch_update_cpu_topology(void);
                                | 0*SD_BALANCE_EXEC                     \
                                | 0*SD_BALANCE_FORK                     \
                                | 0*SD_BALANCE_WAKE                     \
-                               | 1*SD_WAKE_AFFINE                      \
+                               | 0*SD_WAKE_AFFINE                      \
                                | 0*SD_SHARE_CPUPOWER                   \
                                | 0*SD_POWERSAVINGS_BALANCE             \
                                | 0*SD_SHARE_PKG_RESOURCES              \