intr: Remove no longer correct ithread_cpuid; use rman_get_cpuid instead

diff --git a/sys/dev/netif/acx/if_acx.c b/sys/dev/netif/acx/if_acx.c
index be55e4e..b151cef 100644 (file)
--- a/sys/dev/netif/acx/if_acx.c
+++ b/sys/dev/netif/acx/if_acx.c
@@ -549,7 +549,7 @@ acx_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        if (bootverbose)

diff --git a/sys/dev/netif/ae/if_ae.c b/sys/dev/netif/ae/if_ae.c
index d4ba61a..091fada 100644 (file)
--- a/sys/dev/netif/ae/if_ae.c
+++ b/sys/dev/netif/ae/if_ae.c
@@ -1405,7 +1405,7 @@ ae_attach(device_t dev)
                ether_ifdetach(ifp);
                goto fail;
        }
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->ae_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->ae_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
        return 0;
 fail:

diff --git a/sys/dev/netif/age/if_age.c b/sys/dev/netif/age/if_age.c
index c2279a4..d875bc2 100644 (file)
--- a/sys/dev/netif/age/if_age.c
+++ b/sys/dev/netif/age/if_age.c
@@ -666,7 +666,7 @@ age_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->age_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->age_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
        return 0;
 fail:

diff --git a/sys/dev/netif/ale/if_ale.c b/sys/dev/netif/ale/if_ale.c
index c292bfc..cda56bc 100644 (file)
--- a/sys/dev/netif/ale/if_ale.c
+++ b/sys/dev/netif/ale/if_ale.c
@@ -639,7 +639,7 @@ ale_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->ale_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->ale_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
        return 0;
 fail:

diff --git a/sys/dev/netif/an/if_an_isa.c b/sys/dev/netif/an/if_an_isa.c
index c39b7d3..06bd08f 100644 (file)
--- a/sys/dev/netif/an/if_an_isa.c
+++ b/sys/dev/netif/an/if_an_isa.c
@@ -125,7 +125,7 @@ an_attach_isa(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/an/if_an_pccard.c b/sys/dev/netif/an/if_an_pccard.c
index 16a2c33..2407b50 100644 (file)
--- a/sys/dev/netif/an/if_an_pccard.c
+++ b/sys/dev/netif/an/if_an_pccard.c
@@ -168,7 +168,7 @@ an_pccard_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/an/if_an_pci.c b/sys/dev/netif/an/if_an_pci.c
index e69a4e5..6c19798 100644 (file)
--- a/sys/dev/netif/an/if_an_pci.c
+++ b/sys/dev/netif/an/if_an_pci.c
@@ -212,7 +212,7 @@ an_attach_pci(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c
index 5d951bd..276bbd7 100644 (file)
--- a/sys/dev/netif/bfe/if_bfe.c
+++ b/sys/dev/netif/bfe/if_bfe.c
@@ -426,7 +426,7 @@ bfe_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->bfe_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->bfe_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
        return 0;
 fail:

diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index a76e5dc..e1a65d4 100644 (file)
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -2117,7 +2117,7 @@ bge_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->bge_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->bge_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/bwi/if_bwi.c b/sys/dev/netif/bwi/if_bwi.c
index 35926c4..1710784 100644 (file)
--- a/sys/dev/netif/bwi/if_bwi.c
+++ b/sys/dev/netif/bwi/if_bwi.c
@@ -813,7 +813,7 @@ bwi_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        if (bootverbose)

diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index 7657905..52e7055 100644 (file)
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -686,7 +686,7 @@ cs_attach(device_t dev)
                goto bad;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index 540295d..0e3762c 100644 (file)
--- a/sys/dev/netif/dc/if_dc.c
+++ b/sys/dev/netif/dc/if_dc.c
@@ -2186,7 +2186,7 @@ dc_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->dc_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->dc_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index be8eb4c..86c7b3c 100644 (file)
--- a/sys/dev/netif/de/if_de.c
+++ b/sys/dev/netif/de/if_de.c
@@ -4176,7 +4176,7 @@ tulip_pci_attach(device_t dev)
                return ENXIO;
            }
 
-           sc->tulip_if.if_cpuid = ithread_cpuid(rman_get_start(res));
+           sc->tulip_if.if_cpuid = rman_get_cpuid(res);
            KKASSERT(sc->tulip_if.if_cpuid >= 0 &&
                     sc->tulip_if.if_cpuid < ncpus);
        }

diff --git a/sys/dev/netif/ed/if_ed_isa.c b/sys/dev/netif/ed/if_ed_isa.c
index 7f2fc72..190b2c2 100644 (file)
--- a/sys/dev/netif/ed/if_ed_isa.c
+++ b/sys/dev/netif/ed/if_ed_isa.c
@@ -139,8 +139,7 @@ ed_isa_attach(device_t dev)
                if (error) {
                        ed_isa_detach(dev);
                } else {
-                       ifp->if_cpuid =
-                               ithread_cpuid(rman_get_start(sc->irq_res));
+                       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
                        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
                }
        } else {

diff --git a/sys/dev/netif/ed/if_ed_pccard.c b/sys/dev/netif/ed/if_ed_pccard.c
index 40296a1..abe918b 100644 (file)
--- a/sys/dev/netif/ed/if_ed_pccard.c
+++ b/sys/dev/netif/ed/if_ed_pccard.c
@@ -290,7 +290,7 @@ ed_pccard_attach(device_t dev)
                ed_release_resources(dev);
                return (error);
        } else {
-               ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+               ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
                KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
        }
 

diff --git a/sys/dev/netif/ed/if_ed_pci.c b/sys/dev/netif/ed/if_ed_pci.c
index feea09f..20dc28e 100644 (file)
--- a/sys/dev/netif/ed/if_ed_pci.c
+++ b/sys/dev/netif/ed/if_ed_pci.c
@@ -111,8 +111,7 @@ ed_pci_attach(device_t dev)
                if (error) {
                        ed_pci_detach(dev);
                } else {
-                       ifp->if_cpuid =
-                               ithread_cpuid(rman_get_start(sc->irq_res));
+                       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
                        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
                }
        } else {

diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c
index 7a75677..5e2bf37 100644 (file)
--- a/sys/dev/netif/ep/if_ep_isa.c
+++ b/sys/dev/netif/ep/if_ep_isa.c
@@ -330,7 +330,7 @@ ep_isa_attach(device_t dev)
                goto bad;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/ep/if_ep_pccard.c b/sys/dev/netif/ep/if_ep_pccard.c
index 2b1737f..8617941 100644 (file)
--- a/sys/dev/netif/ep/if_ep_pccard.c
+++ b/sys/dev/netif/ep/if_ep_pccard.c
@@ -217,7 +217,7 @@ ep_pccard_attach(device_t dev)
                goto bad;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/et/if_et.c b/sys/dev/netif/et/if_et.c
index c12f149..d75590a 100644 (file)
--- a/sys/dev/netif/et/if_et.c
+++ b/sys/dev/netif/et/if_et.c
@@ -374,7 +374,7 @@ et_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/ex/if_ex_isa.c b/sys/dev/netif/ex/if_ex_isa.c
index 8bc5c80..c4f174d 100644 (file)
--- a/sys/dev/netif/ex/if_ex_isa.c
+++ b/sys/dev/netif/ex/if_ex_isa.c
@@ -286,7 +286,7 @@ ex_isa_attach(device_t dev)
                goto bad;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/ex/if_ex_pccard.c b/sys/dev/netif/ex/if_ex_pccard.c
index dd5c943..0f0a33c 100644 (file)
--- a/sys/dev/netif/ex/if_ex_pccard.c
+++ b/sys/dev/netif/ex/if_ex_pccard.c
@@ -168,7 +168,7 @@ ex_pccard_attach(device_t dev)
                goto bad;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index df0d7c4..d1c1d20 100644 (file)
--- a/sys/dev/netif/fe/if_fe.c
+++ b/sys/dev/netif/fe/if_fe.c
@@ -821,7 +821,7 @@ fe_attach (device_t dev)
                return ENXIO;
        }
 
-       sc->sc_if.if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+       sc->sc_if.if_cpuid = rman_get_cpuid(sc->irq_res);
        KKASSERT(sc->sc_if.if_cpuid >= 0 && sc->sc_if.if_cpuid < ncpus);
   
        /* Print additional info when attached.  */

diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index 77e2407..0a34c33 100644 (file)
--- a/sys/dev/netif/fxp/if_fxp.c
+++ b/sys/dev/netif/fxp/if_fxp.c
@@ -682,7 +682,7 @@ fxp_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/iwl/iwl2100.c b/sys/dev/netif/iwl/iwl2100.c
index 2a781fe..af278e9 100644 (file)
--- a/sys/dev/netif/iwl/iwl2100.c
+++ b/sys/dev/netif/iwl/iwl2100.c
@@ -314,7 +314,7 @@ iwl2100_attach(device_t dev)
                return ENXIO;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        /*

diff --git a/sys/dev/netif/jme/if_jme.c b/sys/dev/netif/jme/if_jme.c
index 2b03050..5c73caa 100644 (file)
--- a/sys/dev/netif/jme/if_jme.c
+++ b/sys/dev/netif/jme/if_jme.c
@@ -887,7 +887,7 @@ jme_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->jme_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->jme_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
        return 0;
 fail:

diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index cb24ec5..0af10fd 100644 (file)
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -557,7 +557,7 @@ lge_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->lge_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->lge_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/lnc/if_lnc_isa.c b/sys/dev/netif/lnc/if_lnc_isa.c
index a5d83f2..1600b72 100644 (file)
--- a/sys/dev/netif/lnc/if_lnc_isa.c
+++ b/sys/dev/netif/lnc/if_lnc_isa.c
@@ -428,7 +428,7 @@ le_isa_attach(device_t dev)
                goto fail_am7990;
        }
 
-       sc->ifp->if_cpuid = ithread_cpuid(rman_get_start(lesc->sc_ires));
+       sc->ifp->if_cpuid = rman_get_cpuid(lesc->sc_ires);
        KKASSERT(sc->ifp->if_cpuid >= 0 && sc->ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/lnc/if_lnc_pci.c b/sys/dev/netif/lnc/if_lnc_pci.c
index cedf5b9..3e303b1 100644 (file)
--- a/sys/dev/netif/lnc/if_lnc_pci.c
+++ b/sys/dev/netif/lnc/if_lnc_pci.c
@@ -443,7 +443,7 @@ le_pci_attach(device_t dev)
                goto fail_am79900;
        }
 
-       sc->ifp->if_cpuid = ithread_cpuid(rman_get_start(lesc->sc_ires));
+       sc->ifp->if_cpuid = rman_get_cpuid(lesc->sc_ires);
        KKASSERT(sc->ifp->if_cpuid >= 0 && sc->ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/msk/if_msk.c b/sys/dev/netif/msk/if_msk.c
index 6a3f4fc..b9a3452 100644 (file)
--- a/sys/dev/netif/msk/if_msk.c
+++ b/sys/dev/netif/msk/if_msk.c
@@ -1740,7 +1740,7 @@ mskc_attach(device_t dev)
                goto fail;
        }
 
-       cpuid = ithread_cpuid(rman_get_start(sc->msk_irq));
+       cpuid = rman_get_cpuid(sc->msk_irq);
        KKASSERT(cpuid >= 0 && cpuid < ncpus);
 
        if (sc->msk_if[0] != NULL)

diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index d154c83..e292d8b 100644 (file)
--- a/sys/dev/netif/my/if_my.c
+++ b/sys/dev/netif/my/if_my.c
@@ -960,7 +960,7 @@ my_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->my_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->my_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/nfe/if_nfe.c b/sys/dev/netif/nfe/if_nfe.c
index 38cc91b..882832f 100644 (file)
--- a/sys/dev/netif/nfe/if_nfe.c
+++ b/sys/dev/netif/nfe/if_nfe.c
@@ -652,7 +652,7 @@ nfe_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index e56025b..760ac94 100644 (file)
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -907,7 +907,7 @@ nge_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->nge_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->nge_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index b1c8e40..ccfe9f2 100644 (file)
--- a/sys/dev/netif/pcn/if_pcn.c
+++ b/sys/dev/netif/pcn/if_pcn.c
@@ -623,7 +623,7 @@ pcn_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->pcn_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->pcn_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return (0);

diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c
index ece8243..6231be4 100644 (file)
--- a/sys/dev/netif/re/if_re.c
+++ b/sys/dev/netif/re/if_re.c
@@ -1615,7 +1615,7 @@ re_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->re_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->re_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
 fail:

diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index f109227..e484f1a 100644 (file)
--- a/sys/dev/netif/rl/if_rl.c
+++ b/sys/dev/netif/rl/if_rl.c
@@ -878,7 +878,7 @@ rl_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->rl_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->rl_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/rtw/rtw.c b/sys/dev/netif/rtw/rtw.c
index 3b5052b..a55a843 100644 (file)
--- a/sys/dev/netif/rtw/rtw.c
+++ b/sys/dev/netif/rtw/rtw.c
@@ -3903,7 +3903,7 @@ rtw_attach(device_t dev)
                goto err;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        device_printf(dev, "hardware version %c\n", sc->sc_hwverid);

diff --git a/sys/dev/netif/sbni/if_sbni_pci.c b/sys/dev/netif/sbni/if_sbni_pci.c
index 540742e..8bca822 100644 (file)
--- a/sys/dev/netif/sbni/if_sbni_pci.c
+++ b/sys/dev/netif/sbni/if_sbni_pci.c
@@ -147,8 +147,7 @@ sbni_pci_attach(device_t dev)
                if (error) {
                        kprintf("sbni%d: bus_setup_intr\n", next_sbni_unit);
                } else {
-                       ifp->if_cpuid =
-                               ithread_cpuid(rman_get_start(sc->irq_res));
+                       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
                        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
                }
        } else {

diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index 4c85211..53a9b3c 100644 (file)
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -275,7 +275,7 @@ sbsh_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index d1eee4e..2c3dd7d 100644 (file)
--- a/sys/dev/netif/sf/if_sf.c
+++ b/sys/dev/netif/sf/if_sf.c
@@ -778,7 +778,7 @@ sf_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sf_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->sf_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index 1f39eda..0baedba 100644 (file)
--- a/sys/dev/netif/sis/if_sis.c
+++ b/sys/dev/netif/sis/if_sis.c
@@ -1172,7 +1172,7 @@ sis_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sis_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->sis_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
 fail:

diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index 73f3c4f..8aaa41d 100644 (file)
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -1522,7 +1522,7 @@ skc_attach(device_t dev)
                goto fail;
        }
 
-       cpuid = ithread_cpuid(rman_get_start(sc->sk_irq));
+       cpuid = rman_get_cpuid(sc->sk_irq);
        KKASSERT(cpuid >= 0 && cpuid < ncpus);
 
        if (sc->sk_if[0] != NULL)

diff --git a/sys/dev/netif/sln/if_sln.c b/sys/dev/netif/sln/if_sln.c
index 8d18d6b..f34bc27 100644 (file)
--- a/sys/dev/netif/sln/if_sln.c
+++ b/sys/dev/netif/sln/if_sln.c
@@ -266,7 +266,7 @@ sln_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sln_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->sln_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index 62086b2..9d9f878 100644 (file)
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -231,7 +231,7 @@ sn_attach(device_t dev)
                return error;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq_res));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq_res);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index 4b8913a..12a3d9b 100644 (file)
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -976,7 +976,7 @@ ste_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->ste_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->ste_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/stge/if_stge.c b/sys/dev/netif/stge/if_stge.c
index 5f8cf2b..239eada 100644 (file)
--- a/sys/dev/netif/stge/if_stge.c
+++ b/sys/dev/netif/stge/if_stge.c
@@ -803,7 +803,7 @@ stge_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
 fail:

diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 91cf39e..5dd6fe0 100644 (file)
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -1572,7 +1572,7 @@ ti_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->ti_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->ti_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index ba659ba..edc3aae 100644 (file)
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -1239,7 +1239,7 @@ tl_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->tl_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->tl_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 840c476..237cc13 100644 (file)
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -280,7 +280,7 @@ epic_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c
index cb55a38..01674a1 100644 (file)
--- a/sys/dev/netif/txp/if_txp.c
+++ b/sys/dev/netif/txp/if_txp.c
@@ -320,7 +320,7 @@ txp_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->sc_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->sc_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/vge/if_vge.c b/sys/dev/netif/vge/if_vge.c
index c63d892..0fa0cf0 100644 (file)
--- a/sys/dev/netif/vge/if_vge.c
+++ b/sys/dev/netif/vge/if_vge.c
@@ -1033,7 +1033,7 @@ vge_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->vge_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->vge_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index 2753068..8298ba4 100644 (file)
--- a/sys/dev/netif/vr/if_vr.c
+++ b/sys/dev/netif/vr/if_vr.c
@@ -797,7 +797,7 @@ vr_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->vr_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->vr_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/dev/netif/vx/if_vx_pci.c b/sys/dev/netif/vx/if_vx_pci.c
index 29db987..0baf4c8 100644 (file)
--- a/sys/dev/netif/vx/if_vx_pci.c
+++ b/sys/dev/netif/vx/if_vx_pci.c
@@ -179,7 +179,7 @@ vx_pci_attach(device_t dev)
        goto bad;
     }
 
-    ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->vx_irq));
+    ifp->if_cpuid = rman_get_cpuid(sc->vx_irq);
     KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
     return(0);

diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index c91bfec..3347846 100644 (file)
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -819,7 +819,7 @@ wb_attach(device_t dev)
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->wb_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->wb_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return(0);

diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c
index c84424e..60361ef 100644 (file)
--- a/sys/dev/netif/xe/if_xe.c
+++ b/sys/dev/netif/xe/if_xe.c
@@ -337,7 +337,7 @@ xe_attach (device_t dev)
     return err;
   }
 
-  scp->ifp->if_cpuid = ithread_cpuid(rman_get_start(scp->irq_res));
+  scp->ifp->if_cpuid = rman_get_cpuid(scp->irq_res);
   KKASSERT(scp->ifp->if_cpuid >= 0 && scp->ifp->if_cpuid < ncpus);
 
   /* Done */

diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index 2a2784e..c58decb 100644 (file)
--- a/sys/dev/netif/xl/if_xl.c
+++ b/sys/dev/netif/xl/if_xl.c
@@ -1553,7 +1553,7 @@ done:
                goto fail;
        }
 
-       ifp->if_cpuid = ithread_cpuid(rman_get_start(sc->xl_irq));
+       ifp->if_cpuid = rman_get_cpuid(sc->xl_irq);
        KKASSERT(ifp->if_cpuid >= 0 && ifp->if_cpuid < ncpus);
 
        return 0;

diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 1d21b53..1bbe479 100644 (file)
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -1009,12 +1009,6 @@ emergency_intr_timer_callback(systimer_t info, int in_ipi __unused,
        lwkt_schedule(info->data);
 }
 
-int
-ithread_cpuid(int intr)
-{
-       return machintr_intr_cpuid(intr);
-}
-
 /* 
  * Sysctls used by systat and others: hw.intrnames and hw.intrcnt.
  * The data for this machine dependent, and the declarations are in machine

diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 82eb646..4c02bf2 100644 (file)
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -125,7 +125,6 @@ void unregister_randintr(int intr);
 int next_registered_randintr(int intr);
 void sched_ithd_soft(int intr);        /* procedure called from MD */
 void sched_ithd_hard(int intr);        /* procedure called from MD */
-int ithread_cpuid(int intr);
 
 extern char    eintrnames[];   /* end of intrnames[] */
 extern char    intrnames[];    /* string table containing device names */