diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-15 23:26:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-15 23:26:49 -0700 |
| commit | fea67d3dfd13bcca4daa62cbafe6f8eb99523217 (patch) | |
| tree | 86aa20659a0c1af70084357ae9356d869f4fad1c /arch/arm/mach-mvebu | |
| parent | 8b2496a22810531cb9157191cd0264bae8efeca0 (diff) | |
| parent | a7160b7eaf2d914e1b552807b9d13acf23b47293 (diff) | |
Merge tag 'soc-3.12' of git://git.infradead.org/linux-mvebu into next/cleanup
From Jason Cooper:
mvebu soc changes for v3.12
- mvebu
- cleanup redundant code
* tag 'soc-3.12' of git://git.infradead.org/linux-mvebu:
ARM: mach-mvebu: remove redundant DT parsing and validation
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/platsmp.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c index ce81d3031405..2e4508a9baf6 100644 --- a/arch/arm/mach-mvebu/platsmp.c +++ b/arch/arm/mach-mvebu/platsmp.c @@ -87,28 +87,11 @@ static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle) static void __init armada_xp_smp_init_cpus(void) { - struct device_node *np; - unsigned int i, ncores; + unsigned int ncores = num_possible_cpus(); - np = of_find_node_by_name(NULL, "cpus"); - if (!np) - panic("No 'cpus' node found\n"); - - ncores = of_get_child_count(np); if (ncores == 0 || ncores > ARMADA_XP_MAX_CPUS) panic("Invalid number of CPUs in DT\n"); - /* Limit possible CPUs to defconfig */ - if (ncores > nr_cpu_ids) { - pr_warn("SMP: %d CPUs physically present. Only %d configured.", - ncores, nr_cpu_ids); - pr_warn("Clipping CPU count to %d\n", nr_cpu_ids); - ncores = nr_cpu_ids; - } - - for (i = 0; i < ncores; i++) - set_cpu_possible(i, true); - set_smp_cross_call(armada_mpic_send_doorbell); } |