diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/include/asm/topology.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-ip27/topology.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/topology.h | 1 | ||||
| -rw-r--r-- | arch/sh/include/asm/topology.h | 1 | ||||
| -rw-r--r-- | arch/sparc/include/asm/topology_64.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/topology.h | 2 |
6 files changed, 1 insertions, 7 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index 569b9dafc78c..d0141fbf51d0 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h | |||
| @@ -68,7 +68,6 @@ void build_cpu_to_node_map(void); | |||
| 68 | | SD_BALANCE_NEWIDLE \ | 68 | | SD_BALANCE_NEWIDLE \ |
| 69 | | SD_BALANCE_EXEC \ | 69 | | SD_BALANCE_EXEC \ |
| 70 | | SD_BALANCE_FORK \ | 70 | | SD_BALANCE_FORK \ |
| 71 | | SD_BALANCE_WAKE \ | ||
| 72 | | SD_WAKE_AFFINE, \ | 71 | | SD_WAKE_AFFINE, \ |
| 73 | .last_balance = jiffies, \ | 72 | .last_balance = jiffies, \ |
| 74 | .balance_interval = 1, \ | 73 | .balance_interval = 1, \ |
| @@ -94,7 +93,6 @@ void build_cpu_to_node_map(void); | |||
| 94 | | SD_BALANCE_NEWIDLE \ | 93 | | SD_BALANCE_NEWIDLE \ |
| 95 | | SD_BALANCE_EXEC \ | 94 | | SD_BALANCE_EXEC \ |
| 96 | | SD_BALANCE_FORK \ | 95 | | SD_BALANCE_FORK \ |
| 97 | | SD_BALANCE_WAKE \ | ||
| 98 | | SD_SERIALIZE, \ | 96 | | SD_SERIALIZE, \ |
| 99 | .last_balance = jiffies, \ | 97 | .last_balance = jiffies, \ |
| 100 | .balance_interval = 64, \ | 98 | .balance_interval = 64, \ |
diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h index d8332398f5be..230591707005 100644 --- a/arch/mips/include/asm/mach-ip27/topology.h +++ b/arch/mips/include/asm/mach-ip27/topology.h | |||
| @@ -48,7 +48,6 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; | |||
| 48 | .cache_nice_tries = 1, \ | 48 | .cache_nice_tries = 1, \ |
| 49 | .flags = SD_LOAD_BALANCE \ | 49 | .flags = SD_LOAD_BALANCE \ |
| 50 | | SD_BALANCE_EXEC \ | 50 | | SD_BALANCE_EXEC \ |
| 51 | | SD_BALANCE_WAKE, \ | ||
| 52 | .last_balance = jiffies, \ | 51 | .last_balance = jiffies, \ |
| 53 | .balance_interval = 1, \ | 52 | .balance_interval = 1, \ |
| 54 | .nr_balance_failed = 0, \ | 53 | .nr_balance_failed = 0, \ |
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index 1a2c9eb42a03..394edcbcce71 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h | |||
| @@ -63,7 +63,6 @@ static inline int pcibus_to_node(struct pci_bus *bus) | |||
| 63 | | SD_BALANCE_EXEC \ | 63 | | SD_BALANCE_EXEC \ |
| 64 | | SD_BALANCE_FORK \ | 64 | | SD_BALANCE_FORK \ |
| 65 | | SD_BALANCE_NEWIDLE \ | 65 | | SD_BALANCE_NEWIDLE \ |
| 66 | | SD_BALANCE_WAKE \ | ||
| 67 | | SD_SERIALIZE, \ | 66 | | SD_SERIALIZE, \ |
| 68 | .last_balance = jiffies, \ | 67 | .last_balance = jiffies, \ |
| 69 | .balance_interval = 1, \ | 68 | .balance_interval = 1, \ |
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index a8cc564b703d..f8c40cc65054 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | .flags = SD_LOAD_BALANCE \ | 21 | .flags = SD_LOAD_BALANCE \ |
| 22 | | SD_BALANCE_FORK \ | 22 | | SD_BALANCE_FORK \ |
| 23 | | SD_BALANCE_EXEC \ | 23 | | SD_BALANCE_EXEC \ |
| 24 | | SD_BALANCE_WAKE \ | ||
| 25 | | SD_BALANCE_NEWIDLE \ | 24 | | SD_BALANCE_NEWIDLE \ |
| 26 | | SD_SERIALIZE, \ | 25 | | SD_SERIALIZE, \ |
| 27 | .last_balance = jiffies, \ | 26 | .last_balance = jiffies, \ |
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index 10b979d1de20..26cd25c08399 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h | |||
| @@ -57,7 +57,6 @@ static inline int pcibus_to_node(struct pci_bus *pbus) | |||
| 57 | .flags = SD_LOAD_BALANCE \ | 57 | .flags = SD_LOAD_BALANCE \ |
| 58 | | SD_BALANCE_FORK \ | 58 | | SD_BALANCE_FORK \ |
| 59 | | SD_BALANCE_EXEC \ | 59 | | SD_BALANCE_EXEC \ |
| 60 | | SD_BALANCE_WAKE \ | ||
| 61 | | SD_SERIALIZE, \ | 60 | | SD_SERIALIZE, \ |
| 62 | .last_balance = jiffies, \ | 61 | .last_balance = jiffies, \ |
| 63 | .balance_interval = 1, \ | 62 | .balance_interval = 1, \ |
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 589f12383d78..6f0695d744bf 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -141,7 +141,7 @@ extern unsigned long node_remap_size[]; | |||
| 141 | | 1*SD_BALANCE_NEWIDLE \ | 141 | | 1*SD_BALANCE_NEWIDLE \ |
| 142 | | 1*SD_BALANCE_EXEC \ | 142 | | 1*SD_BALANCE_EXEC \ |
| 143 | | 1*SD_BALANCE_FORK \ | 143 | | 1*SD_BALANCE_FORK \ |
| 144 | | 1*SD_BALANCE_WAKE \ | 144 | | 0*SD_BALANCE_WAKE \ |
| 145 | | 1*SD_WAKE_AFFINE \ | 145 | | 1*SD_WAKE_AFFINE \ |
| 146 | | 0*SD_SHARE_CPUPOWER \ | 146 | | 0*SD_SHARE_CPUPOWER \ |
| 147 | | 0*SD_POWERSAVINGS_BALANCE \ | 147 | | 0*SD_POWERSAVINGS_BALANCE \ |