From 900b001bb262a59136f6515c490e78b88bf8f0fe Mon Sep 17 00:00:00 2001
From: tedu <tedu@openbsd.org>
Date: Wed, 17 Dec 2014 19:39:01 +0000
Subject: [PATCH] fix/reduce header dependencies. clock.c doesn't need any of
 this uvm. ok deraadt kettenis

---
 sys/arch/sparc64/dev/vdsp.c      |  3 ++-
 sys/arch/sparc64/sparc64/clock.c | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sys/arch/sparc64/dev/vdsp.c b/sys/arch/sparc64/dev/vdsp.c
index 9e394d8ffca..4cc7513d99a 100644
--- a/sys/arch/sparc64/dev/vdsp.c
+++ b/sys/arch/sparc64/dev/vdsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vdsp.c,v 1.33 2014/12/09 06:58:29 doug Exp $	*/
+/*	$OpenBSD: vdsp.c,v 1.34 2014/12/17 19:39:01 tedu Exp $	*/
 /*
  * Copyright (c) 2009, 2011, 2014 Mark Kettenis
  *
@@ -24,6 +24,7 @@
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
+#include <sys/lock.h>
 #include <sys/namei.h>
 #include <sys/systm.h>
 #include <sys/task.h>
diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c
index 43457cf709a..0bfe3360787 100644
--- a/sys/arch/sparc64/sparc64/clock.c
+++ b/sys/arch/sparc64/sparc64/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.55 2014/11/16 12:30:59 deraadt Exp $	*/
+/*	$OpenBSD: clock.c,v 1.56 2014/12/17 19:39:01 tedu Exp $	*/
 /*	$NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */
 
 /*
@@ -75,8 +75,7 @@
 #endif
 #include <sys/sched.h>
 #include <sys/timetc.h>
-
-#include <uvm/uvm_extern.h>
+#include <sys/atomic.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
@@ -307,11 +306,9 @@ clock_bus_wenable(handle, onoff)
 
 	s = splhigh();
 	if (onoff)
-		prot = writers++ == 0 ?
-		    PROT_READ | PROT_WRITE | PMAP_WIRED : 0;
+		prot = writers++ == 0 ? 1 : 0;
 	else
-		prot = --writers == 0 ?
-		    PROT_READ | PMAP_WIRED : 0;
+		prot = --writers == 0 ? 1 : 0;
 	splx(s);
 
 	if (prot) {
-- 
2.20.1