Skip to content

Commit 53140b7

Browse files
author
David S. Miller
committed
[SPARC64]: Do not touch %tick_cmpr on sun4v cpus.
This register is not a part of the sun4v architecture. Niagara 1 and 2 happened to leave it around. Signed-off-by: David S. Miller <[email protected]>
1 parent cf5adce commit 53140b7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/sparc64/kernel/head.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,12 +715,13 @@ setup_trap_table:
715715

716716
membar #Sync
717717

718+
BRANCH_IF_SUN4V(o2, 1f)
719+
718720
/* Kill PROM timer */
719721
sethi %hi(0x80000000), %o2
720722
sllx %o2, 32, %o2
721723
wr %o2, 0, %tick_cmpr
722724

723-
BRANCH_IF_SUN4V(o2, 1f)
724725
BRANCH_IF_ANY_CHEETAH(o2, o3, 1f)
725726

726727
ba,pt %xcc, 2f

0 commit comments

Comments
 (0)