diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-i386/topology.h | 1 | ||||
-rw-r--r-- | include/asm-ia64/topology.h | 2 | ||||
-rw-r--r-- | include/asm-mips/mach-ip27/topology.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/topology.h | 1 | ||||
-rw-r--r-- | include/asm-x86_64/topology.h | 1 | ||||
-rw-r--r-- | include/linux/sched.h | 9 | ||||
-rw-r--r-- | include/linux/topology.h | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h index 0ec27c9e8e45..d7e19eb344b7 100644 --- a/include/asm-i386/topology.h +++ b/include/asm-i386/topology.h | |||
@@ -72,7 +72,6 @@ static inline int node_to_first_cpu(int node) | |||
72 | .max_interval = 32, \ | 72 | .max_interval = 32, \ |
73 | .busy_factor = 32, \ | 73 | .busy_factor = 32, \ |
74 | .imbalance_pct = 125, \ | 74 | .imbalance_pct = 125, \ |
75 | .cache_hot_time = (10*1000000), \ | ||
76 | .cache_nice_tries = 1, \ | 75 | .cache_nice_tries = 1, \ |
77 | .busy_idx = 3, \ | 76 | .busy_idx = 3, \ |
78 | .idle_idx = 1, \ | 77 | .idle_idx = 1, \ |
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h index f7c330467e7e..d8aae4da3978 100644 --- a/include/asm-ia64/topology.h +++ b/include/asm-ia64/topology.h | |||
@@ -55,7 +55,6 @@ void build_cpu_to_node_map(void); | |||
55 | .max_interval = 4, \ | 55 | .max_interval = 4, \ |
56 | .busy_factor = 64, \ | 56 | .busy_factor = 64, \ |
57 | .imbalance_pct = 125, \ | 57 | .imbalance_pct = 125, \ |
58 | .cache_hot_time = (10*1000000), \ | ||
59 | .per_cpu_gain = 100, \ | 58 | .per_cpu_gain = 100, \ |
60 | .cache_nice_tries = 2, \ | 59 | .cache_nice_tries = 2, \ |
61 | .busy_idx = 2, \ | 60 | .busy_idx = 2, \ |
@@ -81,7 +80,6 @@ void build_cpu_to_node_map(void); | |||
81 | .max_interval = 8*(min(num_online_cpus(), 32)), \ | 80 | .max_interval = 8*(min(num_online_cpus(), 32)), \ |
82 | .busy_factor = 64, \ | 81 | .busy_factor = 64, \ |
83 | .imbalance_pct = 125, \ | 82 | .imbalance_pct = 125, \ |
84 | .cache_hot_time = (10*1000000), \ | ||
85 | .cache_nice_tries = 2, \ | 83 | .cache_nice_tries = 2, \ |
86 | .busy_idx = 3, \ | 84 | .busy_idx = 3, \ |
87 | .idle_idx = 2, \ | 85 | .idle_idx = 2, \ |
diff --git a/include/asm-mips/mach-ip27/topology.h b/include/asm-mips/mach-ip27/topology.h index 82141c711c33..59d26b52ba32 100644 --- a/include/asm-mips/mach-ip27/topology.h +++ b/include/asm-mips/mach-ip27/topology.h | |||
@@ -27,7 +27,6 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; | |||
27 | .max_interval = 32, \ | 27 | .max_interval = 32, \ |
28 | .busy_factor = 32, \ | 28 | .busy_factor = 32, \ |
29 | .imbalance_pct = 125, \ | 29 | .imbalance_pct = 125, \ |
30 | .cache_hot_time = (10*1000), \ | ||
31 | .cache_nice_tries = 1, \ | 30 | .cache_nice_tries = 1, \ |
32 | .per_cpu_gain = 100, \ | 31 | .per_cpu_gain = 100, \ |
33 | .flags = SD_LOAD_BALANCE \ | 32 | .flags = SD_LOAD_BALANCE \ |
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h index 9f3d4da261c4..1e19cd00af25 100644 --- a/include/asm-powerpc/topology.h +++ b/include/asm-powerpc/topology.h | |||
@@ -39,7 +39,6 @@ static inline int node_to_first_cpu(int node) | |||
39 | .max_interval = 32, \ | 39 | .max_interval = 32, \ |
40 | .busy_factor = 32, \ | 40 | .busy_factor = 32, \ |
41 | .imbalance_pct = 125, \ | 41 | .imbalance_pct = 125, \ |
42 | .cache_hot_time = (10*1000000), \ | ||
43 | .cache_nice_tries = 1, \ | 42 | .cache_nice_tries = 1, \ |
44 | .per_cpu_gain = 100, \ | 43 | .per_cpu_gain = 100, \ |
45 | .busy_idx = 3, \ | 44 | .busy_idx = 3, \ |
diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h index 7d82bc56b9fa..2fa7f27381b4 100644 --- a/include/asm-x86_64/topology.h +++ b/include/asm-x86_64/topology.h | |||
@@ -39,7 +39,6 @@ extern int __node_distance(int, int); | |||
39 | .max_interval = 32, \ | 39 | .max_interval = 32, \ |
40 | .busy_factor = 32, \ | 40 | .busy_factor = 32, \ |
41 | .imbalance_pct = 125, \ | 41 | .imbalance_pct = 125, \ |
42 | .cache_hot_time = (10*1000000), \ | ||
43 | .cache_nice_tries = 2, \ | 42 | .cache_nice_tries = 2, \ |
44 | .busy_idx = 3, \ | 43 | .busy_idx = 3, \ |
45 | .idle_idx = 2, \ | 44 | .idle_idx = 2, \ |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 3b74c4bf2934..5d6b9228bba9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -631,7 +631,14 @@ struct sched_domain { | |||
631 | 631 | ||
632 | extern void partition_sched_domains(cpumask_t *partition1, | 632 | extern void partition_sched_domains(cpumask_t *partition1, |
633 | cpumask_t *partition2); | 633 | cpumask_t *partition2); |
634 | #endif /* CONFIG_SMP */ | 634 | |
635 | /* | ||
636 | * Maximum cache size the migration-costs auto-tuning code will | ||
637 | * search from: | ||
638 | */ | ||
639 | extern unsigned int max_cache_size; | ||
640 | |||
641 | #endif /* CONFIG_SMP */ | ||
635 | 642 | ||
636 | 643 | ||
637 | struct io_context; /* See blkdev.h */ | 644 | struct io_context; /* See blkdev.h */ |
diff --git a/include/linux/topology.h b/include/linux/topology.h index 3df1d474e5c5..315a5163d6a0 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
@@ -86,7 +86,6 @@ | |||
86 | .max_interval = 2, \ | 86 | .max_interval = 2, \ |
87 | .busy_factor = 8, \ | 87 | .busy_factor = 8, \ |
88 | .imbalance_pct = 110, \ | 88 | .imbalance_pct = 110, \ |
89 | .cache_hot_time = 0, \ | ||
90 | .cache_nice_tries = 0, \ | 89 | .cache_nice_tries = 0, \ |
91 | .per_cpu_gain = 25, \ | 90 | .per_cpu_gain = 25, \ |
92 | .busy_idx = 0, \ | 91 | .busy_idx = 0, \ |
@@ -117,7 +116,6 @@ | |||
117 | .max_interval = 4, \ | 116 | .max_interval = 4, \ |
118 | .busy_factor = 64, \ | 117 | .busy_factor = 64, \ |
119 | .imbalance_pct = 125, \ | 118 | .imbalance_pct = 125, \ |
120 | .cache_hot_time = (5*1000000/2), \ | ||
121 | .cache_nice_tries = 1, \ | 119 | .cache_nice_tries = 1, \ |
122 | .per_cpu_gain = 100, \ | 120 | .per_cpu_gain = 100, \ |
123 | .busy_idx = 2, \ | 121 | .busy_idx = 2, \ |