diff options
| author | Abhimanyu Kapur <abhimany@codeaurora.org> | 2014-02-18 09:36:37 -0800 |
|---|---|---|
| committer | Matt Wagantall <mattw@codeaurora.org> | 2015-05-30 20:22:36 -0700 |
| commit | 17fd1174f243cc0a33a31a2c7e33e051bd884136 (patch) | |
| tree | b7a40ac6274eb674e7ac78de393f35c955901a20 /arch | |
| parent | 07b97c487ad8faecd264a5fad4967065bd96a2c9 (diff) | |
arm64: smp: move the pen to a header file
Move the secondary_pen_release variable and the
secondary_holding_pen entry function to asm/smp_plat.h so
that the other cpu ops implementations can share them.
Change-Id: I9cee3e01185df5e9977795cc778848d91d370b70
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/smp_plat.h | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/smp.c | 1 | ||||
| -rw-r--r-- | arch/arm64/kernel/smp_spin_table.c | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/smp_plat.h b/arch/arm64/include/asm/smp_plat.h index 59e282311b58..235ff04f4704 100644 --- a/arch/arm64/include/asm/smp_plat.h +++ b/arch/arm64/include/asm/smp_plat.h @@ -34,10 +34,12 @@ static inline u32 mpidr_hash_size(void) return 1 << mpidr_hash.bits; } +extern void secondary_holding_pen(void); /* * Logical CPU mapping. */ extern u64 __cpu_logical_map[NR_CPUS]; #define cpu_logical_map(cpu) __cpu_logical_map[cpu] +extern volatile unsigned long secondary_holding_pen_release; #endif /* __ASM_SMP_PLAT_H */ diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 8d0adb8d3dbc..049070439b69 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -60,6 +60,7 @@ * where to place its SVC stack */ struct secondary_data secondary_data; +volatile unsigned long secondary_holding_pen_release = INVALID_HWID; enum ipi_msg_type { IPI_RESCHEDULE, diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c index 92e9ef4bac01..cb844b3ca591 100644 --- a/arch/arm64/kernel/smp_spin_table.c +++ b/arch/arm64/kernel/smp_spin_table.c @@ -27,9 +27,6 @@ #include <asm/cputype.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]; /* |