Date: Sun, 3 Oct 2004 21:44:17 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 62609 for review Message-ID: <200410032144.i93LiH8Y010397@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=62609 Change 62609 by julian@julian_ref on 2004/10/03 21:44:09 IFC@62606 Affected files ... .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/nsched/sys/boot/common/bcache.c#2 integrate .. //depot/projects/nsched/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/nsched/sys/dev/pst/pst-iop.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/uhci.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#26 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#12 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#41 integrate Differences ... ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#24 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.506 2004/10/03 00:16:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.507 2004/10/03 20:14:06 alc Exp $"); /* * Manages physical address maps. @@ -1978,7 +1978,7 @@ */ if ((origpte & ~(PG_M|PG_A)) != newpte) { pte_store(pte, newpte | PG_A); - /*if (origpte)*/ { + if (origpte) { pmap_invalidate_page(pmap, va); } } ==== //depot/projects/nsched/sys/boot/common/bcache.c#2 (text+ko) ==== @@ -25,12 +25,14 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/bcache.c,v 1.12 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/bcache.c,v 1.13 2004/10/03 16:34:01 stefanf Exp $"); /* * Simple LRU block cache */ +#include <sys/stdint.h> + #include <stand.h> #include <string.h> #include <bitstring.h> @@ -337,7 +339,7 @@ u_int i; for (i = 0; i < bcache_nblks; i++) { - printf("%08x %04x %04x|", bcache_ctl[i].bc_blkno, (unsigned int)bcache_ctl[i].bc_stamp & 0xffff, bcache_ctl[i].bc_count & 0xffff); + printf("%08jx %04x %04x|", (uintmax_t)bcache_ctl[i].bc_blkno, (unsigned int)bcache_ctl[i].bc_stamp & 0xffff, bcache_ctl[i].bc_count & 0xffff); if (((i + 1) % 4) == 0) printf("\n"); } ==== //depot/projects/nsched/sys/dev/pst/pst-iop.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pst/pst-iop.c,v 1.6 2003/08/24 17:54:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pst/pst-iop.c,v 1.7 2004/10/03 16:06:46 stefanf Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,8 +89,8 @@ printf("pstiop: malloc of delayed attach hook failed\n"); return 0; } - sc->iop_delayed_attach->ich_func = (void *)iop_attach; - sc->iop_delayed_attach->ich_arg = (void *)sc; + sc->iop_delayed_attach->ich_func = iop_attach; + sc->iop_delayed_attach->ich_arg = sc; if (config_intrhook_establish(sc->iop_delayed_attach)) { printf("pstiop: config_intrhook_establish failed\n"); free(sc->iop_delayed_attach, M_PSTIOP); @@ -99,10 +99,12 @@ } void -iop_attach(struct iop_softc *sc) +iop_attach(void *arg) { + struct iop_softc *sc; int i; + sc = arg; if (sc->iop_delayed_attach) { config_intrhook_disestablish(sc->iop_delayed_attach); free(sc->iop_delayed_attach, M_PSTIOP); ==== //depot/projects/nsched/sys/dev/pst/pst-iop.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pst/pst-iop.h,v 1.5 2004/09/15 15:39:28 sos Exp $ + * $FreeBSD: src/sys/dev/pst/pst-iop.h,v 1.6 2004/10/03 16:06:46 stefanf Exp $ */ /* misc defines */ @@ -631,7 +631,7 @@ /* prototypes */ int iop_init(struct iop_softc *); -void iop_attach(struct iop_softc *); +void iop_attach(void *); void iop_intr(void *); int iop_reset(struct iop_softc *); int iop_init_outqueue(struct iop_softc *); ==== //depot/projects/nsched/sys/dev/usb/uhci.c#4 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.154 2004/08/02 20:53:31 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.155 2004/10/03 16:12:29 stefanf Exp $"); /* @@ -280,8 +280,8 @@ Static void uhci_device_clear_toggle(usbd_pipe_handle pipe); Static void uhci_noop(usbd_pipe_handle pipe); -Static __inline__ uhci_soft_qh_t *uhci_find_prev_qh(uhci_soft_qh_t *, - uhci_soft_qh_t *); +Static __inline uhci_soft_qh_t *uhci_find_prev_qh(uhci_soft_qh_t *, + uhci_soft_qh_t *); #ifdef USB_DEBUG Static void uhci_dump_all(uhci_softc_t *); @@ -391,7 +391,7 @@ } while (0) #define uhci_active_intr_info(ii) ((ii)->list.le_prev != NULL) -Static __inline__ uhci_soft_qh_t * +Static __inline uhci_soft_qh_t * uhci_find_prev_qh(uhci_soft_qh_t *pqh, uhci_soft_qh_t *sqh) { DPRINTFN(15,("uhci_find_prev_qh: pqh=%p sqh=%p\n", pqh, sqh)); ==== //depot/projects/nsched/sys/dev/usb/usbdevs#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.204 2004/10/03 09:30:09 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -437,6 +437,7 @@ vendor DELORME 0x1163 DeLorme Publishing vendor ACERCM 0x1189 Acer Communications & Multimedia Inc. vendor BELKIN2 0x1293 Belkin Components +vendor AINCOMM 0x12fd Ain Communication Technology vendor MOBILITY 0x1342 Mobility vendor SHARK 0x13d2 Shark vendor SILICONPORTALS 0x1527 Silicon Portals @@ -527,6 +528,9 @@ product AGFA SNAPSCANE26 0x2097 SnapScan e26 product AGFA SNAPSCANE52 0x20fd SnapScan e52 +/* Ain Communication Technology products */ +product AINCOMM AWU2000B 0x1001 AWU2000B Wireless adapter + /* AKS products */ product AKS USBHASP 0x0001 USB-HASP 0.06 @@ -572,6 +576,7 @@ product ATMEL UHB124 0x3301 UHB124 hub product ATMEL DWL120 0x7603 DWL-120 Wireless adapter product ATMEL BW002 0x7605 BW002 Wireless adapter +product ATMEL WL1130USB 0x7613 WL-1130 USB product ATMEL AT76C505A 0x7614 AT76c505a Wireless adapter /* Avision products */ ==== //depot/projects/nsched/sys/i386/i386/pmap.c#26 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.511 2004/10/03 00:16:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.512 2004/10/03 20:14:07 alc Exp $"); /* * Manages physical address maps. @@ -2041,7 +2041,7 @@ */ if ((origpte & ~(PG_M|PG_A)) != newpte) { pte_store(pte, newpte | PG_A); - /*if (origpte)*/ { + if (origpte) { pmap_invalidate_page(pmap, va); } } ==== //depot/projects/nsched/sys/kern/kern_sig.c#12 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.291 2004/10/01 14:15:20 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.292 2004/10/03 13:23:49 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1812,7 +1812,7 @@ * It will die elsewhere. * All threads must be restarted. */ - p->p_flag &= ~P_STOPPED; + p->p_flag &= ~P_STOPPED_SIG; goto runfast; } ==== //depot/projects/nsched/sys/kern/kern_thread.c#41 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.199 2004/09/25 00:53:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.200 2004/10/03 20:06:11 julian Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -282,13 +282,13 @@ * Initialize type-stable parts of a ksegrp (when newly created). */ static int -ksegrp_init(void *mem, int size, int flags) +ksegrp_ctor(void *mem, int size, void *arg, int flags) { struct ksegrp *kg; kg = (struct ksegrp *)mem; + bzero(mem, size); kg->kg_sched = (struct kg_sched *)&kg[1]; - /* sched_newksegrp(kg); */ return (0); } @@ -369,7 +369,7 @@ tid_zone = uma_zcreate("TID", sizeof(struct tid_bitmap_part), NULL, NULL, NULL, NULL, UMA_ALIGN_CACHE, 0); ksegrp_zone = uma_zcreate("KSEGRP", sched_sizeof_ksegrp(), - NULL, NULL, ksegrp_init, NULL, + ksegrp_ctor, NULL, NULL, NULL, UMA_ALIGN_CACHE, 0); kseinit(); /* set up kse specific stuff e.g. upcall zone*/ }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410032144.i93LiH8Y010397>