diff options
author | jhb <jhb@FreeBSD.org> | 2000-11-01 18:40:42 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2000-11-01 18:40:42 +0000 |
commit | af87892726ba369e11d02a86ed44830c739cd311 (patch) | |
tree | 9d48ecf3c82adba880b0621b953ed221cc657eb6 /sys | |
parent | 9b0a561703be32661910f94cd90c9a84cac698c2 (diff) | |
download | FreeBSD-src-af87892726ba369e11d02a86ed44830c739cd311.zip FreeBSD-src-af87892726ba369e11d02a86ed44830c739cd311.tar.gz |
Pass in the new-bus flags to alpha_setup_intr().
Diffstat (limited to 'sys')
-rw-r--r-- | sys/alpha/isa/isa.c | 2 | ||||
-rw-r--r-- | sys/alpha/mcbus/mcpcia.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/apecs.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/cia.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/t2.c | 4 | ||||
-rw-r--r-- | sys/alpha/pci/tsunami.c | 2 | ||||
-rw-r--r-- | sys/alpha/tlsb/dwlpx.c | 3 |
7 files changed, 9 insertions, 8 deletions
diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c index 96cfe1c..961860c 100644 --- a/sys/alpha/isa/isa.c +++ b/sys/alpha/isa/isa.c @@ -320,7 +320,7 @@ isa_setup_intr(device_t dev, device_t child, error = alpha_setup_intr( device_get_nameunit(child ? child : dev), 0x800 + (irq->r_start << 4), isa_handle_intr, ii, - ithread_priority(flags), &ii->ih, + ithread_priority(flags), flags, &ii->ih, &intrcnt[INTRCNT_ISA_IRQ + irq->r_start], NULL, NULL); if (error) { diff --git a/sys/alpha/mcbus/mcpcia.c b/sys/alpha/mcbus/mcpcia.c index b123c97..0712261 100644 --- a/sys/alpha/mcbus/mcpcia.c +++ b/sys/alpha/mcbus/mcpcia.c @@ -376,7 +376,7 @@ mcpcia_setup_intr(device_t dev, device_t child, struct resource *ir, int flags, birq = irq + INTRCNT_KN300_IRQ; pri = ithread_priority(flags); error = alpha_setup_intr(device_get_nameunit(child ? child : dev), h, - intr, arg, pri, cp, &intrcnt[birq], + intr, arg, pri, flags, cp, &intrcnt[birq], mcpcia_disable_intr_vec, mcpcia_enable_intr_vec); if (error) return error; diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c index ddd129a..8721e33 100644 --- a/sys/alpha/pci/apecs.c +++ b/sys/alpha/pci/apecs.c @@ -371,7 +371,7 @@ apecs_setup_intr(device_t dev, device_t child, error = alpha_setup_intr(device_get_nameunit(child ? child : dev), 0x900 + (irq->r_start << 4), intr, arg, - ithread_priority(flags), cookiep, + ithread_priority(flags), flags, cookiep, &intrcnt[INTRCNT_EB64PLUS_IRQ + irq->r_start], apecs_disable_intr, apecs_enable_intr); if (error) diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c index 14dfa98..84a671f 100644 --- a/sys/alpha/pci/cia.c +++ b/sys/alpha/pci/cia.c @@ -542,7 +542,7 @@ cia_setup_intr(device_t dev, device_t child, error = alpha_setup_intr( device_get_nameunit(child ? child : dev), 0x900 + (irq->r_start << 4), intr, arg, - ithread_priority(flags), cookiep, + ithread_priority(flags), flags, cookiep, &intrcnt[INTRCNT_EB164_IRQ + irq->r_start], cia_disable_intr, cia_enable_intr); if (error) diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c index a15ff16..48e0d94 100644 --- a/sys/alpha/pci/t2.c +++ b/sys/alpha/pci/t2.c @@ -373,8 +373,8 @@ t2_setup_intr(device_t dev, device_t child, return error; error = alpha_setup_intr(device_get_nameunit(child ? child : dev), - vector, intr, arg, ithread_priority(flags), cookiep, - &intrcnt[irq->r_start], + vector, intr, arg, ithread_priority(flags), flags, + cookiep, &intrcnt[irq->r_start], t2_disable_intr, t2_enable_intr); if (error) return error; diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c index f2ef20f..c07200a 100644 --- a/sys/alpha/pci/tsunami.c +++ b/sys/alpha/pci/tsunami.c @@ -331,7 +331,7 @@ tsunami_setup_intr(device_t dev, device_t child, error = alpha_setup_intr(device_get_nameunit(child ? child : dev), 0x900 + (irq->r_start << 4), intr, arg, - ithread_priority(flags), cookiep, + ithread_priority(flags), flags, cookiep, &intrcnt[INTRCNT_EB164_IRQ + irq->r_start], tsunami_disable_intr_vec, tsunami_enable_intr_vec); if (error) diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c index 4e78eb0..2e16a11 100644 --- a/sys/alpha/tlsb/dwlpx.c +++ b/sys/alpha/tlsb/dwlpx.c @@ -393,7 +393,8 @@ dwlpx_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, vector = DWLPX_MVEC(ionode, hose, slot); pri = ithread_priority(flags); error = alpha_setup_intr(device_get_nameunit(child ? child : dev), - vector, intr, arg, pri, cookiep, &intrcnt[INTRCNT_KN8AE_IRQ], NULL, NULL); + vector, intr, arg, pri, flags, cookiep, + &intrcnt[INTRCNT_KN8AE_IRQ], NULL, NULL); if (error) return error; dwlpx_enadis_intr(vector, intpin, 1); |