Module Name: src
Committed By: nakayama
Date: Sat May 16 19:19:04 UTC 2009
Modified Files:
src/sys/arch/sparc64/sparc64: cpu.c locore.s
Log Message:
Remove clear %tick in locore.s since it is cleared at cpu_initclocks() in
clock.c.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.288 -r1.289 src/sys/arch/sparc64/sparc64/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.81 src/sys/arch/sparc64/sparc64/cpu.c:1.82
--- src/sys/arch/sparc64/sparc64/cpu.c:1.81 Wed Mar 18 10:22:37 2009
+++ src/sys/arch/sparc64/sparc64/cpu.c Sat May 16 19:19:04 2009
@@ -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_reset_fpustate();
curlwp = curcpu()->ci_data.cpu_idlelwp;
membar_sync();
+ settick(0);
tickintr_establish(PIL_CLOCK, tickintr);
spl0();
}
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.288 src/sys/arch/sparc64/sparc64/locore.s:1.289
--- src/sys/arch/sparc64/sparc64/locore.s:1.288 Mon Dec 15 06:44:56 2008
+++ src/sys/arch/sparc64/sparc64/locore.s Sat May 16 19:19:04 2009
@@ -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 @@
.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 @@
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
