From 981db6d4846ff52a5e76c18517d079599fe5da98 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sun, 31 Mar 2013 17:07:04 +0000
Subject: try to avoid pulling in pte.h and other more crazy things.  Checked
 against the things that libkvm needs.

---
 sys/arch/hppa/include/cpu.h  | 4 +++-
 sys/arch/hppa/include/pmap.h | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'sys/arch/hppa/include')

diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h
index ebc07d46137..8a90d0b4485 100644
--- a/sys/arch/hppa/include/cpu.h
+++ b/sys/arch/hppa/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.85 2013/03/23 16:12:22 deraadt Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.86 2013/03/31 17:07:03 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000-2004 Michael Shalayeff
@@ -51,8 +51,10 @@
 #ifndef	_MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_
 
+#ifdef _KERNEL
 #include <machine/trap.h>
 #include <machine/frame.h>
+#endif /* _KERNEL */
 
 /*
  * CPU types and features
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h
index a34a8dbe227..b80b1f4bc02 100644
--- a/sys/arch/hppa/include/pmap.h
+++ b/sys/arch/hppa/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.43 2011/11/14 14:29:53 deraadt Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.44 2013/03/31 17:07:03 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002-2004 Michael Shalayeff
@@ -29,10 +29,10 @@
 #ifndef _MACHINE_PMAP_H_
 #define _MACHINE_PMAP_H_
 
-#include <machine/pte.h>
 #include <uvm/uvm_object.h>
 
 #ifdef	_KERNEL
+#include <machine/pte.h>
 
 struct pmap {
 	struct uvm_object pm_obj;	/* object (lck by object lock) */
-- 
cgit v1.2.3