diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:36:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:36:21 -0700 |
| commit | 6bb597507f9839b13498781e481f5458aea33620 (patch) | |
| tree | 33e6cbc66736e221217356c7120465be10dbaa1e /arch/x86/kernel/setup_percpu.c | |
| parent | 09f38dc19deba9eae1d668dde8bdd2aaed3479ed (diff) | |
| parent | c5c67c7cba6a652d1c62dce45b0c130e5cb2a802 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mtrr: remove debug message
x86: disable stack-protector for __restore_processor_state()
x86: fix is_io_mapping_possible() build warning on i386 allnoconfig
x86, setup: compile with -DDISABLE_BRANCH_PROFILING
x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
x86, mm: fix misuse of debug_kmap_atomic
x86: remove duplicated code with pcpu_need_numa()
x86,percpu: fix inverted NUMA test in setup_pcpu_remap()
x86: signal: check sas_ss_size instead of sas_ss_flags()
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 400331b50a5..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) static ssize_t __init setup_pcpu_remap(size_t static_size) { static struct vm_struct vm; - pg_data_t *last; size_t ptrs_size, dyn_size; unsigned int cpu; ssize_t ret; @@ -162,22 +161,9 @@ static ssize_t __init setup_pcpu_remap(size_t static_size) * If large page isn't supported, there's no benefit in doing * this. Also, on non-NUMA, embedding is better. */ - if (!cpu_has_pse || pcpu_need_numa()) + if (!cpu_has_pse || !pcpu_need_numa()) return -EINVAL; - last = NULL; - for_each_possible_cpu(cpu) { - int node = early_cpu_to_node(cpu); - - if (node_online(node) && NODE_DATA(node) && - last && last != NODE_DATA(node)) - goto proceed; - - last = NODE_DATA(node); - } - return -EINVAL; - -proceed: /* * Currently supports only single page. Supporting multiple * pages won't be too difficult if it ever becomes necessary. |