Skip to content

Commit 7dc4088

Browse files
author
David S. Miller
committed
[SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too.
Signed-off-by: David S. Miller <[email protected]>
1 parent 53140b7 commit 7dc4088

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

arch/sparc64/kernel/trampoline.S

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,13 @@ spitfire_startup:
9595
membar #Sync
9696

9797
startup_continue:
98+
mov %o0, %l0
99+
BRANCH_IF_SUN4V(g1, niagara_lock_tlb)
100+
98101
sethi %hi(0x80000000), %g2
99102
sllx %g2, 32, %g2
100103
wr %g2, 0, %tick_cmpr
101104

102-
mov %o0, %l0
103-
104-
BRANCH_IF_SUN4V(g1, niagara_lock_tlb)
105-
106105
/* Call OBP by hand to lock KERNBASE into i/d tlbs.
107106
* We lock 2 consequetive entries if we are 'bigkernel'.
108107
*/

0 commit comments

Comments
 (0)