these headers do not need to (and should not) include lock.h poisoning

the namespace. ok deraadt

diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index bd654f1..3f815e5 100644 (file)
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpu.h,v 1.87 2014/12/02 18:13:10 tedu Exp $   */
+/*     $OpenBSD: cpu.h,v 1.88 2014/12/16 21:20:23 tedu Exp $   */
 /*     $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $     */
 
 /*-
@@ -55,7 +55,6 @@
 #endif /* _KERNEL */
 
 #include <sys/device.h>
-#include <sys/lock.h>
 #include <sys/sched.h>
 #include <sys/sensors.h>
 

diff --git a/sys/arch/amd64/include/pic.h b/sys/arch/amd64/include/pic.h
index 580738b..59846fb 100644 (file)
--- a/sys/arch/amd64/include/pic.h
+++ b/sys/arch/amd64/include/pic.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pic.h,v 1.6 2011/05/21 15:58:27 kettenis Exp $        */
+/*     $OpenBSD: pic.h,v 1.7 2014/12/16 21:20:23 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;