From ed5e46c9f66681ff0ac643e07a7e05f04cbde6d8 Mon Sep 17 00:00:00 2001
From: nakayama <nakayama@NetBSD.org>
Date: Sat, 16 May 2009 19:19:04 +0000
Subject: [PATCH] Remove clear %tick in locore.s since it is cleared at
 cpu_initclocks() in clock.c.

---
 sys/arch/sparc64/sparc64/cpu.c    | 5 +++--
 sys/arch/sparc64/sparc64/locore.s | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c
index fca00d5e5db4..14e68088e5b9 100644
--- a/sys/arch/sparc64/sparc64/cpu.c
+++ b/sys/arch/sparc64/sparc64/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.81 2009/03/18 10:22:37 cegger Exp $ */
+/*	$NetBSD: cpu.c,v 1.82 2009/05/16 19:19:04 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.81 2009/03/18 10:22:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.82 2009/05/16 19:19:04 nakayama Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -427,6 +427,7 @@ cpu_hatch(void)
 	cpu_reset_fpustate();
 	curlwp = curcpu()->ci_data.cpu_idlelwp;
 	membar_sync();
+	settick(0);
 	tickintr_establish(PIL_CLOCK, tickintr);
 	spl0();
 }
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s
index c569aec2f37f..cec5e27ab537 100644
--- a/sys/arch/sparc64/sparc64/locore.s
+++ b/sys/arch/sparc64/sparc64/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.288 2008/12/15 06:44:56 mrg Exp $	*/
+/*	$NetBSD: locore.s,v 1.289 2009/05/16 19:19:04 nakayama Exp $	*/
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath
@@ -4936,10 +4936,9 @@ ENTRY_NOPROFILE(print_itlb)
 	.align	8
 start:
 dostart:
-	wrpr	%g0, 0, %tick	! XXXXXXX clear %tick register for now
 	mov	1, %g1
 	sllx	%g1, 63, %g1
-	wr	%g1, TICK_CMPR	! XXXXXXX clear and disable %tick_cmpr as well
+	wr	%g1, TICK_CMPR	! XXXXXXX clear and disable %tick_cmpr for now
 	/*
 	 * Startup.
 	 *
@@ -5182,7 +5181,6 @@ ENTRY(cpu_mp_startup)
 	mov	1, %o0
 	sllx	%o0, 63, %o0
 	wr	%o0, TICK_CMPR	! XXXXXXX clear and disable %tick_cmpr for now
-	wrpr	%g0, 0, %tick	! XXXXXXX clear %tick register as well
 	wrpr    %g0, 0, %cleanwin
 	wrpr	%g0, 0, %tl			! Make sure we're not in NUCLEUS mode
 	wrpr	%g0, WSTATE_KERN, %wstate