[SPARC64]: Do not touch %tick_cmpr on sun4v cpus.

[karo-tx-linux.git] / arch / sparc64 / kernel / head.S

diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index a2652bcfeb15ca989f272c1579cbb5328119b519..63144ad476f6663c1ab3ed98fd252503fc89ebdb 100644 (file)
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -715,12 +715,13 @@ setup_trap_table:
 
        membar  #Sync
 
+       BRANCH_IF_SUN4V(o2, 1f)
+
        /* Kill PROM timer */
        sethi   %hi(0x80000000), %o2
        sllx    %o2, 32, %o2
        wr      %o2, 0, %tick_cmpr
 
-       BRANCH_IF_SUN4V(o2, 1f)
        BRANCH_IF_ANY_CHEETAH(o2, o3, 1f)
 
        ba,pt   %xcc, 2f