summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-12-16 21:40:06 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-12-16 21:40:06 +0000
commit7e7d40da763b065bdcbdea098ef96657cb9334ae (patch)
tree673e6724f9d73a40944def627236a34a9bbe0b16 /sys/arch
parent6659bc491ced44e85ac0cda0ef969c18109296f1 (diff)
don't include lock.h by default. poisons namespace. ok deraadt
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/include/cpu.h3
-rw-r--r--sys/arch/i386/include/pic.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 196b348b9cd..36aec9df34f 100644
--- 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 ce95cc48e45..3e5b2d9e0a8 100644
--- 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;