From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 16 Aug 2007 08:52:44 +0000 (-0700)
Subject: [SPARC64]: Do not touch %tick_cmpr on sun4v cpus.
X-Git-Tag: v2.6.23-rc4~127^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=53140b71c5e7b5370e4ac6ffc13fddbdfae71473;p=linux-2.6-omap-h63xx.git

[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>
---

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:
 
 	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