diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-25 11:03:29 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-25 11:03:29 +0000 |
| commit | 1738a99caa862954a176f61a5b39322cb4d236a9 (patch) | |
| tree | 8174d0a279102d74dc7834b5f2bbfeb6475e7664 /sys/arch/amd64/include/pic.h | |
| parent | 553a08a83999f0198ea42221d73ef0c373884e6a (diff) | |
SMP support. Big parts from NetBSD, but with some really serious debugging
done by me, niklas and others. Especially wrt. NXE support.
Still needs some polishing, especially in dmesg messages, but we're now
building kernel faster than ever.
Diffstat (limited to 'sys/arch/amd64/include/pic.h')
| -rw-r--r-- | sys/arch/amd64/include/pic.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/amd64/include/pic.h b/sys/arch/amd64/include/pic.h index c9d9a5082a6..b6a222b2780 100644 --- a/sys/arch/amd64/include/pic.h +++ b/sys/arch/amd64/include/pic.h @@ -1,11 +1,15 @@ -/* $OpenBSD: pic.h,v 1.1 2004/01/28 01:39:39 mickey Exp $ */ +/* $OpenBSD: pic.h,v 1.2 2004/06/25 11:03:28 art Exp $ */ /* $NetBSD: pic.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */ #ifndef _X86_PIC_H #define _X86_PIC_H #include <sys/device.h> +#ifdef MULTIPROCESSOR +#include <sys/mplock.h> +#else #include <sys/lock.h> +#endif struct cpu_info; @@ -15,7 +19,9 @@ struct cpu_info; struct pic { struct device pic_dev; int pic_type; - simple_lock_t pic_lock; +#ifdef MULTIPROCESSOR + struct SIMPLE_LOCK pic_lock; +#endif void (*pic_hwmask)(struct pic *, int); void (*pic_hwunmask)(struct pic *, int); void (*pic_addroute)(struct pic *, struct cpu_info *, int, int, int); |