diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/ia64/include/asm/topology.h | |
| parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
| parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/include/asm/topology.h')
| -rw-r--r-- | arch/ia64/include/asm/topology.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index 7b4c8c70b2d1..d0141fbf51d0 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h | |||
| @@ -61,12 +61,13 @@ void build_cpu_to_node_map(void); | |||
| 61 | .cache_nice_tries = 2, \ | 61 | .cache_nice_tries = 2, \ |
| 62 | .busy_idx = 2, \ | 62 | .busy_idx = 2, \ |
| 63 | .idle_idx = 1, \ | 63 | .idle_idx = 1, \ |
| 64 | .newidle_idx = 2, \ | 64 | .newidle_idx = 0, \ |
| 65 | .wake_idx = 1, \ | 65 | .wake_idx = 0, \ |
| 66 | .forkexec_idx = 1, \ | 66 | .forkexec_idx = 0, \ |
| 67 | .flags = SD_LOAD_BALANCE \ | 67 | .flags = SD_LOAD_BALANCE \ |
| 68 | | SD_BALANCE_NEWIDLE \ | 68 | | SD_BALANCE_NEWIDLE \ |
| 69 | | SD_BALANCE_EXEC \ | 69 | | SD_BALANCE_EXEC \ |
| 70 | | SD_BALANCE_FORK \ | ||
| 70 | | SD_WAKE_AFFINE, \ | 71 | | SD_WAKE_AFFINE, \ |
| 71 | .last_balance = jiffies, \ | 72 | .last_balance = jiffies, \ |
| 72 | .balance_interval = 1, \ | 73 | .balance_interval = 1, \ |
| @@ -85,14 +86,14 @@ void build_cpu_to_node_map(void); | |||
| 85 | .cache_nice_tries = 2, \ | 86 | .cache_nice_tries = 2, \ |
| 86 | .busy_idx = 3, \ | 87 | .busy_idx = 3, \ |
| 87 | .idle_idx = 2, \ | 88 | .idle_idx = 2, \ |
| 88 | .newidle_idx = 2, \ | 89 | .newidle_idx = 0, \ |
| 89 | .wake_idx = 1, \ | 90 | .wake_idx = 0, \ |
| 90 | .forkexec_idx = 1, \ | 91 | .forkexec_idx = 0, \ |
| 91 | .flags = SD_LOAD_BALANCE \ | 92 | .flags = SD_LOAD_BALANCE \ |
| 93 | | SD_BALANCE_NEWIDLE \ | ||
| 92 | | SD_BALANCE_EXEC \ | 94 | | SD_BALANCE_EXEC \ |
| 93 | | SD_BALANCE_FORK \ | 95 | | SD_BALANCE_FORK \ |
| 94 | | SD_SERIALIZE \ | 96 | | SD_SERIALIZE, \ |
| 95 | | SD_WAKE_BALANCE, \ | ||
| 96 | .last_balance = jiffies, \ | 97 | .last_balance = jiffies, \ |
| 97 | .balance_interval = 64, \ | 98 | .balance_interval = 64, \ |
| 98 | .nr_balance_failed = 0, \ | 99 | .nr_balance_failed = 0, \ |