diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-19 13:01:56 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-19 13:01:56 +0300 |
| commit | 4b131c9bf8af9bc7a25441251f60a8ca7fc69c07 (patch) | |
| tree | ba0bc4861f2f606b088b09c53389f06e88a69894 /arch/arm64/kernel/smp_spin_table.c | |
| parent | d4e209db57abe07163fe84b43b533a4b6246b0c3 (diff) | |
| parent | 08fad54a88981323247c7199ccbb8d42c596466a (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroHEADll-20151119.0linux-linaro-4.3-2015.11ll_20151119.0linux-linaro
Conflicting files:
Diffstat (limited to 'arch/arm64/kernel/smp_spin_table.c')
| -rw-r--r-- | arch/arm64/kernel/smp_spin_table.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c index aef3605a8c47..3d5325d99e8e 100644 --- a/arch/arm64/kernel/smp_spin_table.c +++ b/arch/arm64/kernel/smp_spin_table.c @@ -28,9 +28,6 @@ #include <asm/io.h> #include <asm/smp_plat.h> -extern void secondary_holding_pen(void); -volatile unsigned long secondary_holding_pen_release = INVALID_HWID; - static phys_addr_t cpu_release_addr[NR_CPUS]; /* @@ -125,9 +122,10 @@ static int smp_spin_table_cpu_boot(unsigned int cpu) return 0; } -const struct cpu_operations smp_spin_table_ops = { +static const struct cpu_operations smp_spin_table_ops = { .name = "spin-table", .cpu_init = smp_spin_table_cpu_init, .cpu_prepare = smp_spin_table_cpu_prepare, .cpu_boot = smp_spin_table_cpu_boot, }; +CPU_METHOD_OF_DECLARE(spin_table, &smp_spin_table_ops); |