summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/head.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-08-16 10:52:44 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-08-16 10:52:44 +0200
commit53140b71c5e7b5370e4ac6ffc13fddbdfae71473 (patch)
tree57e50b4c84ddf17012cf1934b7c9cf9a9b7b22c5 /arch/sparc64/kernel/head.S
parent[SPARC64]: Niagara-2 optimized copies. (diff)
downloadlinux-53140b71c5e7b5370e4ac6ffc13fddbdfae71473.tar.xz
linux-53140b71c5e7b5370e4ac6ffc13fddbdfae71473.zip
[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 <davem@davemloft.net>
Diffstat (limited to '')
-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 a2652bcfeb15..63144ad476f6 100644
--- 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