Date: Sun, 21 Jan 2007 16:18:23 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 113256 for review Message-ID: <200701211618.l0LGINAt064197@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=113256 Change 113256 by piso@piso_newluxor on 2007/01/21 16:17:42 Fixed mismerge. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#2 (text+ko) ==== @@ -341,7 +341,7 @@ } error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE, - am7990_intr, sc, &lesc->sc_ih); + NULL, am7990_intr, sc, &lesc->sc_ih); if (error != 0) { device_printf(dev, "cannot set up interrupt\n"); goto fail_am7990; ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#3 (text+ko) ==== @@ -401,7 +401,7 @@ static int upa_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, - driver_intr_t *func, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *func, void *arg, void **cookiep) { struct upa_softc *sc; uint64_t intrmap; @@ -427,8 +427,8 @@ UPA_WRITE(sc, imr, 0x0, intrmap & ~INTMAP_V); (void)UPA_READ(sc, imr, 0x0); - error = bus_generic_setup_intr(dev, child, ires, flags, func, arg, - cookiep); + error = bus_generic_setup_intr(dev, child, ires, flags, filt, func, + arg, cookiep); if (error != 0) return (error); UPA_WRITE(sc, imr, 0x0, INTMAP_ENABLE(intrmap, PCPU_GET(mid)));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701211618.l0LGINAt064197>