diff options
| author |   kettenis <kettenis@openbsd.org> | 2012-08-21 09:24:52 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2012-08-21 09:24:52 +0000 |
| commit | 4c904650d1354dd2002db2dc21df5ac407812a87 (patch) | |
| tree | 5ffc799dd15f6719f81452103aa07b973064b703 | |
| parent | Build sed in distrib/ just like everything else. Simplifies PIE work since (diff) | |
| download | wireguard-openbsd-4c904650d1354dd2002db2dc21df5ac407812a87.tar.xz wireguard-openbsd-4c904650d1354dd2002db2dc21df5ac407812a87.zip | |
For interrupts that get established before we attach the interrupt controller,
store the type of the interrupt (level, edge).
ok miod@, mpi@
| -rw-r--r-- | sys/arch/macppc/macppc/machdep.c | 3 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/intr.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index b5ed9d1fd61..80c0d732f3c 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.131 2011/08/29 20:21:44 drahn Exp $ */ +/* $OpenBSD: machdep.c,v 1.132 2012/08/21 09:24:52 kettenis Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -1008,6 +1008,7 @@ ppc_intr_establish(void *lcv, pci_intr_handle_t ih, int type, int level, if (ppc_configed_intr_cnt < MAX_PRECONF_INTR) { ppc_configed_intr[ppc_configed_intr_cnt].ih_fun = func; ppc_configed_intr[ppc_configed_intr_cnt].ih_arg = arg; + ppc_configed_intr[ppc_configed_intr_cnt].ih_type = type; ppc_configed_intr[ppc_configed_intr_cnt].ih_level = level; ppc_configed_intr[ppc_configed_intr_cnt].ih_irq = ih; ppc_configed_intr[ppc_configed_intr_cnt].ih_what = name; diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index e636d03ee29..2220b8aac71 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.47 2011/08/29 20:21:43 drahn Exp $ */ +/* $OpenBSD: intr.h,v 1.48 2012/08/21 09:24:52 kettenis Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -155,6 +155,7 @@ struct intrhand { int (*ih_fun)(void *); void *ih_arg; struct evcount ih_count; + int ih_type; int ih_level; int ih_irq; const char *ih_what; |