diff options
author | Yinghai Lu <yinghai@kernel.org> | 2009-04-01 03:27:44 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 00:08:05 -0400 |
commit | 3de46fda4c104deef17ec70f85361f5c6b84ce0e (patch) | |
tree | 11f6b217e2f05c8074dd42c851f6d0fc04df25ae /arch/x86/kernel/setup_percpu.c | |
parent | eb12ce60c81826a99eadbc56401e08ceb37a0cc2 (diff) |
x86: remove duplicated code with pcpu_need_numa()
Impact: clean up
those code pcpu_need_numa(), should be removed.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: David Miller <davem@davemloft.net>
LKML-Reference: <49D31770.9090502@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
-rw-r--r-- | arch/x86/kernel/setup_percpu.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 876b1271c1d..3a97a4cf187 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -153,7 +153,6 @@ static struct page * __init pcpur_get_page(unsigned int cpu, int pageno) | |||
153 | static ssize_t __init setup_pcpu_remap(size_t static_size) | 153 | static ssize_t __init setup_pcpu_remap(size_t static_size) |
154 | { | 154 | { |
155 | static struct vm_struct vm; | 155 | static struct vm_struct vm; |
156 | pg_data_t *last; | ||
157 | size_t ptrs_size, dyn_size; | 156 | size_t ptrs_size, dyn_size; |
158 | unsigned int cpu; | 157 | unsigned int cpu; |
159 | ssize_t ret; | 158 | ssize_t ret; |
@@ -165,19 +164,6 @@ static ssize_t __init setup_pcpu_remap(size_t static_size) | |||
165 | if (!cpu_has_pse || !pcpu_need_numa()) | 164 | if (!cpu_has_pse || !pcpu_need_numa()) |
166 | return -EINVAL; | 165 | return -EINVAL; |
167 | 166 | ||
168 | last = NULL; | ||
169 | for_each_possible_cpu(cpu) { | ||
170 | int node = early_cpu_to_node(cpu); | ||
171 | |||
172 | if (node_online(node) && NODE_DATA(node) && | ||
173 | last && last != NODE_DATA(node)) | ||
174 | goto proceed; | ||
175 | |||
176 | last = NODE_DATA(node); | ||
177 | } | ||
178 | return -EINVAL; | ||
179 | |||
180 | proceed: | ||
181 | /* | 167 | /* |
182 | * Currently supports only single page. Supporting multiple | 168 | * Currently supports only single page. Supporting multiple |
183 | * pages won't be too difficult if it ever becomes necessary. | 169 | * pages won't be too difficult if it ever becomes necessary. |