- In sparc64_init() remove the call to tick_stop(). There's no need to

  call tick_stop() again after tick_init() as tick interrupts already
  have been disabled as part of tick_init().
- In spinlock_enter() replace the magic value for PIL TICK with the
  respective macro.
- Use FBSDID.

1 files changed, 4 insertions, 7 deletions

diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index a91f809..89e12d0 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -33,9 +33,11 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * 	from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_kstack_pages.h"
@@ -241,7 +243,7 @@ spinlock_enter(void)
 	td = curthread;
 	if (td->td_md.md_spinlock_count == 0) {
 		pil = rdpr(pil);
-		wrpr(pil, 0, 14);
+		wrpr(pil, 0, PIL_TICK);
 		td->td_md.md_saved_pil = pil;
 	}
 	td->td_md.md_spinlock_count++;
@@ -377,11 +379,6 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec)
 	}
 
 	/*
-	 * Disable tick for now.
-	 */
-	tick_stop();
-
-	/*
 	 * Initialize the interrupt tables.
 	 */
 	intr_init1();