diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:09:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:09:59 +0800 |
| commit | 7b8892bba12eba95f3e1615dfeb8ad77e3b0371a (patch) | |
| tree | 70b4cc1f7003724e722f9fcbd0956e7920c2e854 /arch/arm64/kernel/smp_spin_table.c | |
| parent | fef6c6c09f13ef1f58fd841a08da53c6a8651bdf (diff) | |
| parent | efab1adba28d9ebbfa86808375fc085c4e84e746 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.01-android
Diffstat (limited to 'arch/arm64/kernel/smp_spin_table.c')
| -rw-r--r-- | arch/arm64/kernel/smp_spin_table.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c index 14944e5b28da..aef3605a8c47 100644 --- a/arch/arm64/kernel/smp_spin_table.c +++ b/arch/arm64/kernel/smp_spin_table.c @@ -49,8 +49,14 @@ static void write_pen_release(u64 val) } -static int smp_spin_table_cpu_init(struct device_node *dn, unsigned int cpu) +static int smp_spin_table_cpu_init(unsigned int cpu) { + struct device_node *dn; + + dn = of_get_cpu_node(cpu, NULL); + if (!dn) + return -ENODEV; + /* * Determine the address from which the CPU is polling. */ |