diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2014-02-23 22:42:50 -0500 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2014-04-05 05:16:42 -0400 |
commit | c3441edd2dea83923421fd6050d2ffdc57696323 (patch) | |
tree | fefe55547d09cd06d51841b9ce006567ef39c547 /arch/arc/kernel | |
parent | 6041003a8fecda9932d89d2d49b3ae07475a9ff7 (diff) |
ARC: [SMP] General Fixes
-Pass the expected arg to non-boot park'ing routine
(It worked so far because existing SMP backends don't use the arg)
-CONFIG_DEBUG_PREEMPT warning
Diffstat (limited to 'arch/arc/kernel')
-rw-r--r-- | arch/arc/kernel/head.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S index 991997269d02..4ad04915dc6b 100644 --- a/arch/arc/kernel/head.S +++ b/arch/arc/kernel/head.S | |||
@@ -24,13 +24,13 @@ | |||
24 | .globl stext | 24 | .globl stext |
25 | stext: | 25 | stext: |
26 | ;------------------------------------------------------------------- | 26 | ;------------------------------------------------------------------- |
27 | ; Don't clobber r0-r4 yet. It might have bootloader provided info | 27 | ; Don't clobber r0-r2 yet. It might have bootloader provided info |
28 | ;------------------------------------------------------------------- | 28 | ;------------------------------------------------------------------- |
29 | 29 | ||
30 | sr @_int_vec_base_lds, [AUX_INTR_VEC_BASE] | 30 | sr @_int_vec_base_lds, [AUX_INTR_VEC_BASE] |
31 | 31 | ||
32 | #ifdef CONFIG_SMP | 32 | #ifdef CONFIG_SMP |
33 | ; Only Boot (Master) proceeds. Others wait in platform dependent way | 33 | ; Ensure Boot (Master) proceeds. Others wait in platform dependent way |
34 | ; IDENTITY Reg [ 3 2 1 0 ] | 34 | ; IDENTITY Reg [ 3 2 1 0 ] |
35 | ; (cpu-id) ^^^ => Zero for UP ARC700 | 35 | ; (cpu-id) ^^^ => Zero for UP ARC700 |
36 | ; => #Core-ID if SMP (Master 0) | 36 | ; => #Core-ID if SMP (Master 0) |
@@ -39,7 +39,8 @@ stext: | |||
39 | ; need to make sure only boot cpu takes this path. | 39 | ; need to make sure only boot cpu takes this path. |
40 | GET_CPU_ID r5 | 40 | GET_CPU_ID r5 |
41 | cmp r5, 0 | 41 | cmp r5, 0 |
42 | jnz arc_platform_smp_wait_to_boot | 42 | mov.ne r0, r5 |
43 | jne arc_platform_smp_wait_to_boot | ||
43 | #endif | 44 | #endif |
44 | ; Clear BSS before updating any globals | 45 | ; Clear BSS before updating any globals |
45 | ; XXX: use ZOL here | 46 | ; XXX: use ZOL here |