aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc64/kernel/head.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index a2652bcfeb1..63144ad476f 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -715,12 +715,13 @@ setup_trap_table:
715 715
716 membar #Sync 716 membar #Sync
717 717
718 BRANCH_IF_SUN4V(o2, 1f)
719
718 /* Kill PROM timer */ 720 /* Kill PROM timer */
719 sethi %hi(0x80000000), %o2 721 sethi %hi(0x80000000), %o2
720 sllx %o2, 32, %o2 722 sllx %o2, 32, %o2
721 wr %o2, 0, %tick_cmpr 723 wr %o2, 0, %tick_cmpr
722 724
723 BRANCH_IF_SUN4V(o2, 1f)
724 BRANCH_IF_ANY_CHEETAH(o2, o3, 1f) 725 BRANCH_IF_ANY_CHEETAH(o2, o3, 1f)
725 726
726 ba,pt %xcc, 2f 727 ba,pt %xcc, 2f