浏览代码

[SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 18 年之前
父节点
当前提交
7dc408808a
共有 1 个文件被更改,包括 3 次插入4 次删除
  1. 3 4
      arch/sparc64/kernel/trampoline.S

+ 3 - 4
arch/sparc64/kernel/trampoline.S

@@ -95,14 +95,13 @@ spitfire_startup:
 	membar		#Sync
 	membar		#Sync
 
 
 startup_continue:
 startup_continue:
+	mov		%o0, %l0
+	BRANCH_IF_SUN4V(g1, niagara_lock_tlb)
+
 	sethi		%hi(0x80000000), %g2
 	sethi		%hi(0x80000000), %g2
 	sllx		%g2, 32, %g2
 	sllx		%g2, 32, %g2
 	wr		%g2, 0, %tick_cmpr
 	wr		%g2, 0, %tick_cmpr
 
 
-	mov		%o0, %l0
-
-	BRANCH_IF_SUN4V(g1, niagara_lock_tlb)
-
 	/* Call OBP by hand to lock KERNBASE into i/d tlbs.
 	/* Call OBP by hand to lock KERNBASE into i/d tlbs.
 	 * We lock 2 consequetive entries if we are 'bigkernel'.
 	 * We lock 2 consequetive entries if we are 'bigkernel'.
 	 */
 	 */