don't include lock.h by default. poisons namespace. ok deraadt

diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 196b348..36aec9d 100644 (file)
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpu.h,v 1.136 2014/12/02 18:13:10 tedu Exp $  */
+/*     $OpenBSD: cpu.h,v 1.137 2014/12/16 21:40:05 tedu Exp $  */
 /*     $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $        */
 
 /*-
@@ -64,7 +64,6 @@
 #define clockframe intrframe
 
 #include <sys/device.h>
-#include <sys/lock.h>                  /* will also get LOCKDEBUG */
 #include <sys/sched.h>
 #include <sys/sensors.h>
 

diff --git a/sys/arch/i386/include/pic.h b/sys/arch/i386/include/pic.h
index ce95cc4..3e5b2d9 100644 (file)
--- a/sys/arch/i386/include/pic.h
+++ b/sys/arch/i386/include/pic.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pic.h,v 1.1 2009/08/13 13:24:48 kettenis Exp $        */
+/*     $OpenBSD: pic.h,v 1.2 2014/12/16 21:40:05 tedu Exp $    */
 /*     $NetBSD: pic.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $     */
 
 #ifndef _X86_PIC_H
@@ -6,7 +6,6 @@
 
 #include <sys/device.h>
 #include <sys/mutex.h>
-#include <sys/lock.h>
 
 struct cpu_info;