diff options
Diffstat (limited to 'sys/arch/sparc64/include')
| -rw-r--r-- | sys/arch/sparc64/include/bus.h | 8 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/intr.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h index fd8119eead2..bf016a2ab40 100644 --- a/sys/arch/sparc64/include/bus.h +++ b/sys/arch/sparc64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.28 2013/01/22 23:56:31 dlg Exp $ */ +/* $OpenBSD: bus.h,v 1.29 2013/05/13 17:46:42 kettenis Exp $ */ /* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */ /*- @@ -349,9 +349,9 @@ bus_space_barrier(t, h, o, s, f) #define BUS_SPACE_MAP_BUS4 0x0800 -/* flags for intr_establish() */ -#define BUS_INTR_ESTABLISH_FASTTRAP 1 -#define BUS_INTR_ESTABLISH_SOFTINTR 2 +/* flags for bus_intr_establish() */ +#define BUS_INTR_ESTABLISH_MPSAFE 0x0001 +#define BUS_INTR_ESTABLISH_SOFTINTR 0x0002 /* * Flags used in various bus DMA methods. diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h index e073252fcbf..31be2096fc3 100644 --- a/sys/arch/sparc64/include/intr.h +++ b/sys/arch/sparc64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.14 2011/03/23 17:02:33 deraadt Exp $ */ +/* $OpenBSD: intr.h,v 1.15 2013/05/13 17:46:42 kettenis Exp $ */ /* $NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */ /*- @@ -49,6 +49,7 @@ struct intrhand { short ih_number; /* interrupt number */ /* the H/W provides */ char ih_pil; /* interrupt priority */ + char ih_mpsafe; struct intrhand *ih_next; /* global list */ struct intrhand *ih_pending; /* pending list */ volatile u_int64_t *ih_map; /* interrupt map reg */ |