Date: Fri, 6 Feb 2004 10:23:32 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 46589 for review Message-ID: <200402061823.i16INWlg097114@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=46589 Change 46589 by jhb@jhb_slimer on 2004/02/06 10:23:08 IFC @46586. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#1 branch .. //depot/projects/smpng/sys/amd64/isa/isa_dma.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile.inc#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/i386/mbr/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/Makefile#5 integrate .. //depot/projects/smpng/sys/conf/files#101 integrate .. //depot/projects/smpng/sys/conf/files.amd64#12 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#33 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#8 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#15 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#2 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#14 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#35 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#18 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#11 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#76 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#22 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#5 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#72 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#41 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#21 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#26 integrate .. //depot/projects/smpng/sys/netipsec/key.c#7 integrate .. //depot/projects/smpng/sys/sys/cons.h#7 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#15 integrate .. //depot/projects/smpng/sys/tools/emu10k1-mkalsa.sh#1 branch .. //depot/projects/smpng/sys/vm/vm_fault.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#55 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/db_interface.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.75 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.77 2004/02/05 17:35:28 kan Exp $"); /* * Interface to new debugger. @@ -87,7 +87,7 @@ * our breakpoints by disarming our breakpoints and fixing up * %eip. */ - if (cons_unavail && ddb_mode) { + if (cnunavailable() != 0 && ddb_mode) { if (type == T_TRCTRAP) { regs->tf_rflags &= ~PSL_T; return (1); @@ -327,7 +327,7 @@ * OK if the call is for the debugger hotkey but not if the call * is a weak form of panicing. */ - if (cons_unavail && !(boothowto & RB_GDB)) + if (cnunavailable() != 0 && !(boothowto & RB_GDB)) return; if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#22 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.451 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.452 2004/02/05 00:11:05 peter Exp $"); /* * Manages physical address maps. @@ -1637,7 +1637,7 @@ #if defined(PMAP_DIAGNOSTIC) if (pmap_nw_modified((pt_entry_t) oldpte)) { printf( - "pmap_remove: modified page not writable: va: 0x%x, pte: 0x%x\n", + "pmap_remove: modified page not writable: va: 0x%lx, pte: 0x%lx\n", va, oldpte); } #endif @@ -1782,7 +1782,7 @@ * XXX This makes pmap_remove_all() illegal for non-managed pages! */ if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", + panic("pmap_remove_all: illegal for unmanaged page, va: 0x%lx", VM_PAGE_TO_PHYS(m)); } #endif @@ -1804,7 +1804,7 @@ #if defined(PMAP_DIAGNOSTIC) if (pmap_nw_modified((pt_entry_t) tpte)) { printf( - "pmap_remove_all: modified page not writable: va: 0x%x, pte: 0x%x\n", + "pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx\n", pv->pv_va, tpte); } #endif @@ -1942,7 +1942,7 @@ if (va > VM_MAX_KERNEL_ADDRESS) panic("pmap_enter: toobig"); if ((va >= UPT_MIN_ADDRESS) && (va < UPT_MAX_ADDRESS)) - panic("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)", va); + panic("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va); #endif mpte = NULL; @@ -1997,7 +1997,7 @@ #if defined(PMAP_DIAGNOSTIC) if (pmap_nw_modified((pt_entry_t) origpte)) { printf( - "pmap_enter: modified page not writable: va: 0x%x, pte: 0x%x\n", + "pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx\n", va, origpte); } #endif @@ -2631,7 +2631,7 @@ continue; #if defined(PMAP_DIAGNOSTIC) if (!pv->pv_pmap) { - printf("Null pmap (tb) at va: 0x%x\n", pv->pv_va); + printf("Null pmap (tb) at va: 0x%lx\n", pv->pv_va); continue; } #endif @@ -2697,7 +2697,7 @@ #if defined(PMAP_DIAGNOSTIC) if (!pv->pv_pmap) { - printf("Null pmap (cb) at va: 0x%x\n", pv->pv_va); + printf("Null pmap (cb) at va: 0x%lx\n", pv->pv_va); continue; } #endif ==== //depot/projects/smpng/sys/amd64/isa/isa_dma.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.16 2003/11/21 03:02:00 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.17 2004/02/05 00:12:08 peter Exp $"); /* * code to manage AT bus @@ -228,7 +228,7 @@ panic("isa_dmastart: channel out of range"); if ((chan < 4 && nbytes > (1<<16)) - || (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1))) + || (chan >= 4 && (nbytes > (1<<17) || (uintptr_t)addr & 1))) panic("isa_dmastart: impossible request"); if ((dma_inuse & (1 << chan)) == 0) ==== //depot/projects/smpng/sys/boot/i386/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,8 @@ # Common defines for all of /sys/boot/i386/ # -# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.4 2003/06/26 03:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.6 2004/02/06 12:58:31 ru Exp $ + +BINDIR?= /boot LOADER_ADDRESS?= 0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 @@ -9,8 +11,7 @@ .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true .endif -.if defined(REALLY_AMD64) && !defined(__been_to_Makefile_inc) -__been_to_Makefile_inc= 1 +.if defined(REALLY_AMD64) CFLAGS+= -m32 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 ==== //depot/projects/smpng/sys/boot/i386/boot0/Makefile#7 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.20 2004/01/06 18:46:35 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.21 2004/02/06 12:58:31 ru Exp $ PROG?= boot0 NOMAN= STRIP= -BINDIR?= /boot BINMODE= 444 M4?= m4 ==== //depot/projects/smpng/sys/boot/i386/boot2/Makefile#12 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.48 2004/02/06 12:58:31 ru Exp $ PROG= boot2 NOMAN= STRIP= -BINDIR?= /boot BINMODE= 444 CLEANFILES= boot boot1 boot1.out boot1.o \ boot2.ldr boot2.bin boot2.ld boot2.out boot2.o boot2.h \ ==== //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.5 2002/09/17 01:48:55 peter Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.6 2004/02/06 12:58:31 ru Exp $ MAINTAINER=jhb@FreeBSD.org @@ -7,7 +7,6 @@ PROG= cdboot NOMAN= STRIP= -BINDIR?= /boot ${PROG}: ${PROG}.o ${LD} -N -e start -Ttext ${ORG} -o ${PROG}.out ${PROG}.o ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#13 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.66 2003/06/26 03:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.68 2004/02/06 12:58:31 ru Exp $ PROG= loader STRIP= NEWVERSWHAT= "bootstrap loader" i386 -BINDIR?= /boot INSTALLFLAGS= -b # architecture-specific loader code @@ -41,7 +40,7 @@ # Always add MI sources .PATH: ${.CURDIR}/../../common -.include <${.CURDIR}/../../common/Makefile.inc> +.include "${.CURDIR}/../../common/Makefile.inc" CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../.. -I. @@ -109,8 +108,6 @@ FILES+= ${.CURDIR}/loader.rc .endif -.include <${.CURDIR}/../Makefile.inc> - # Cannot use ${OBJS} above this line .include <bsd.prog.mk> ==== //depot/projects/smpng/sys/boot/i386/mbr/Makefile#4 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.6 2002/09/17 01:48:55 peter Exp $ +# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.7 2004/02/06 12:58:32 ru Exp $ PROG= mbr NOMAN= STRIP= -BINDIR?= /boot BINMODE= 444 ORG= 0x600 ==== //depot/projects/smpng/sys/boot/i386/pxeldr/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.9 2003/09/03 08:12:20 phk Exp $ +# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.10 2004/02/06 12:58:32 ru Exp $ MAINTAINER=jhb@FreeBSD.org @@ -10,7 +10,6 @@ PROG= ${BOOT} MAN= ${BOOT}.8 STRIP= -BINDIR?= /boot M4?= m4 .if defined(BOOT_PXELDR_PROBE_KEYBOARD) ==== //depot/projects/smpng/sys/conf/files#101 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.861 2004/01/15 10:04:20 onoe Exp $ +# $FreeBSD: src/sys/conf/files,v 1.862 2004/02/05 22:51:15 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -35,6 +35,11 @@ compile-with "${AWK} -f $S/tools/devlist2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule \ clean "miidevs.h" +emu10k1-alsa%diked.h optional pcm pci \ + dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \ + compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ + no-obj no-implicit-rule before-depend \ + clean "emu10k1-alsa%diked.h" kern/device_if.m standard kern/bus_if.m standard kern/clock_if.m optional genclock @@ -719,8 +724,7 @@ dev/sound/pci/csamidi.c optional midi csa dev/sound/pci/csapcm.c optional pcm pci dev/sound/pci/ds1.c optional pcm pci -dev/sound/pci/emu10k1.c optional pcm pci dependency "emu10k1-alsa%diked.h" \ - clean "emu10k1-alsa%diked.h" +dev/sound/pci/emu10k1.c optional pcm pci dependency "emu10k1-alsa%diked.h" dev/sound/pci/es137x.c optional pcm pci dev/sound/pci/fm801.c optional pcm pci dev/sound/pci/ich.c optional pcm pci ==== //depot/projects/smpng/sys/conf/files.amd64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.27 2003/12/11 01:09:51 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.28 2004/02/05 01:09:29 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -70,6 +70,10 @@ amd64/isa/nmi.c standard amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci +crypto/blowfish/bf_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional ipsec ipsec_esp +crypto/blowfish/bf_enc.c optional crypto +crypto/des/des_enc.c optional crypto dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash ==== //depot/projects/smpng/sys/conf/kern.post.mk#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.60 2004/01/21 08:23:46 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.61 2004/02/05 22:51:15 peter Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -224,15 +224,6 @@ vnode_if.h: $S/tools/vnode_if.awk $S/kern/vnode_if.src ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -h -emu10k1-alsa%diked.h: $S/gnu/dev/sound/pci/emu10k1-alsa.h - grep -v '#include' ${.OODATE} | ${CC} -E -D__KERNEL__ -dM - \ - | awk -F"[ (]" '/define/ \ - { print "#ifndef " $$2 ; print ; print "#endif" }' \ - >${.TARGET} -.if !exists(${.OBJDIR}/.depend) -_kernel-depend: emu10k1-alsa%diked.h -.endif - # XXX strictly, everything depends on Makefile because changes to ${PROF} # only appear there, but we don't handle that. ==== //depot/projects/smpng/sys/dev/aac/aac_debug.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.16 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.17 2004/02/06 01:47:52 peter Exp $"); /* * Debugging support. @@ -371,8 +371,8 @@ device_printf(sc->aac_dev, "(DiskSetEvent) event %d " "diskset %lld creator %lld\n", aif->data.EN.data.EDS.eventType, - aif->data.EN.data.EDS.DsNum, - aif->data.EN.data.EDS.CreatorId); + (long long)aif->data.EN.data.EDS.DsNum, + (long long)aif->data.EN.data.EDS.CreatorId); break; case AifDenMorphComplete: /* A morph operation * completed */ ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#8 (text+ko) ==== @@ -1,6 +1,6 @@ # $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aicasm/Makefile#2 $ # -# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.16 2002/09/26 21:46:19 gibbs Exp $ +# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.17 2004/02/05 22:44:24 ru Exp $ PROG= aicasm @@ -12,8 +12,8 @@ SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS} CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g} -DPADD+= ${LIBL} -LDADD+= -ll +DPADD= ${LIBL} +LDADD= -ll # Correct path for kernel builds # Don't rely on the kernel's .depend file ==== //depot/projects/smpng/sys/dev/ata/ata-queue.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.19 2004/01/30 19:16:08 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.20 2004/02/06 11:36:50 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -118,6 +118,7 @@ request->u.ata.feature = feature; request->flags = ATA_R_CONTROL; request->timeout = 5; + request->retries = -1; ata_queue_request(request); error = request->result; ata_free_request(request); ==== //depot/projects/smpng/sys/dev/ath/if_ath.c#15 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.44 2004/01/07 19:16:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.45 2004/02/06 00:10:54 peter Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -1387,8 +1387,8 @@ goto fail1; ds = sc->sc_desc; - DPRINTF(ATH_DEBUG_ANY, ("%s: DMA map: %p (%d) -> %p (%lu)\n", - __func__, ds, sc->sc_desc_len, (caddr_t) sc->sc_desc_paddr, + DPRINTF(ATH_DEBUG_ANY, ("%s: DMA map: %p (%lu) -> %p (%lu)\n", + __func__, ds, (u_long) sc->sc_desc_len, (caddr_t) sc->sc_desc_paddr, /*XXX*/ (u_long) sc->sc_desc_len)); /* allocate buffers */ @@ -2157,7 +2157,7 @@ DPRINTF(ATH_DEBUG_TX_PROC, ("%s: pending %u tx queue %p, link %p\n", __func__, npending, - (caddr_t) ath_hal_gettxbuf(sc->sc_ah, sc->sc_txhalq), + (caddr_t)(uintptr_t) ath_hal_gettxbuf(sc->sc_ah, sc->sc_txhalq), sc->sc_txlink)); for (;;) { ATH_TXQ_LOCK(sc); @@ -2249,12 +2249,12 @@ (void) ath_hal_stoptxdma(ah, sc->sc_txhalq); DPRINTF(ATH_DEBUG_RESET, ("%s: tx queue %p, link %p\n", __func__, - (caddr_t) ath_hal_gettxbuf(ah, sc->sc_txhalq), + (caddr_t)(uintptr_t) ath_hal_gettxbuf(ah, sc->sc_txhalq), sc->sc_txlink)); (void) ath_hal_stoptxdma(ah, sc->sc_bhalq); DPRINTF(ATH_DEBUG_RESET, ("%s: beacon queue %p\n", __func__, - (caddr_t) ath_hal_gettxbuf(ah, sc->sc_bhalq))); + (caddr_t)(uintptr_t) ath_hal_gettxbuf(ah, sc->sc_bhalq))); } for (;;) { ATH_TXQ_LOCK(sc); @@ -2310,7 +2310,7 @@ struct ath_buf *bf; printf("%s: rx queue %p, link %p\n", __func__, - (caddr_t) ath_hal_getrxbuf(ah), sc->sc_rxlink); + (caddr_t)(uintptr_t) ath_hal_getrxbuf(ah), sc->sc_rxlink); TAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) { struct ath_desc *ds = bf->bf_desc; if (ath_hal_rxprocdesc(ah, ds, bf->bf_daddr, ==== //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.1 2003/07/15 11:57:24 harti Exp $ +# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.2 2004/02/05 22:01:28 ru Exp $ # # This program is used to generate the if_patm_rtables.c file # for the idt77252 driver. It is not installed. @@ -6,6 +6,7 @@ PROG=genrtab WARNS=5 NOMAN=true +DPADD=${LIBM} LDADD=-lm install: ==== //depot/projects/smpng/sys/dev/sab/sab.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.21 2003/11/09 09:17:22 tanimura Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.22 2004/02/05 09:50:57 pjd Exp $"); /* * SAB82532 Dual UART driver @@ -646,7 +646,7 @@ if ((tp->t_state & TS_ISOPEN) != 0 && (tp->t_state & TS_XCLUDE) != 0 && - !suser(td)) + suser(td) != 0) return (EBUSY); if ((tp->t_state & TS_ISOPEN) == 0) { ==== //depot/projects/smpng/sys/dev/safe/safe.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.4 2003/08/22 07:04:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.5 2004/02/05 01:35:33 peter Exp $"); /* * SafeNet SafeXcel-1141 hardware crypto accelerator @@ -2103,11 +2103,11 @@ u_int32_t estat = READ_REG(sc, SAFE_PE_ERNGSTAT); /* NB: assume caller has lock on ring */ - printf("%s: ERNGSTAT %x (next %u) back %u front %u\n", + printf("%s: ERNGSTAT %x (next %u) back %lu front %lu\n", tag, estat, (estat >> SAFE_PE_ERNGSTAT_NEXT_S), - sc->sc_back - sc->sc_ring, - sc->sc_front - sc->sc_ring); + (unsigned long)(sc->sc_back - sc->sc_ring), + (unsigned long)(sc->sc_front - sc->sc_ring)); } static void @@ -2131,7 +2131,7 @@ for (nsegs = re->re_src.nsegs; nsegs; nsegs--) { printf(" spd[%u] %p: %p size %u flags %x" , ix, &sc->sc_spring[ix] - , (caddr_t) sc->sc_spring[ix].pd_addr + , (caddr_t)(uintptr_t) sc->sc_spring[ix].pd_addr , sc->sc_spring[ix].pd_size , sc->sc_spring[ix].pd_flags ); @@ -2148,7 +2148,7 @@ for (nsegs = re->re_dst.nsegs; nsegs; nsegs--) { printf(" dpd[%u] %p: %p flags %x\n" , ix, &sc->sc_dpring[ix] - , (caddr_t) sc->sc_dpring[ix].pd_addr + , (caddr_t)(uintptr_t) sc->sc_dpring[ix].pd_addr , sc->sc_dpring[ix].pd_flags ); if (++ix == SAFE_TOTAL_DPART) ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#34 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.410 2004/01/21 05:08:51 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.411 2004/02/05 01:56:42 kan Exp $"); #include "opt_syscons.h" #include "opt_splash.h" @@ -97,6 +97,7 @@ static int sc_saver_keyb_only = 1; static scr_stat *sc_console; static struct tty *sc_console_tty; +static struct consdev *sc_consptr; static void *kernel_console_ts; static char init_done = COLD; @@ -526,7 +527,7 @@ DPRINTF(5, ("sc%d: scclose(), ", scp->sc->unit)); s = spltty(); if ((scp == scp->sc->cur_scp) && (scp->sc->unit == sc_console_unit)) - cons_unavail = FALSE; + cnavailable(sc_consptr, TRUE); if (finish_vt_rel(scp, TRUE, &s) == 0) /* force release */ DPRINTF(5, ("reset WAIT_REL, ")); if (finish_vt_acq(scp) == 0) /* force acknowledge */ @@ -927,7 +928,7 @@ scp->pid = 0; DPRINTF(5, ("VT_AUTO, ")); if ((scp == sc->cur_scp) && (sc->unit == sc_console_unit)) - cons_unavail = FALSE; + cnavailable(sc_consptr, TRUE); /* were we in the middle of the vty switching process? */ if (finish_vt_rel(scp, TRUE, &s) == 0) DPRINTF(5, ("reset WAIT_REL, ")); @@ -945,7 +946,7 @@ scp->proc = td->td_proc; scp->pid = scp->proc->p_pid; if ((scp == sc->cur_scp) && (sc->unit == sc_console_unit)) - cons_unavail = TRUE; + cnavailable(sc_consptr, FALSE); } splx(s); DPRINTF(5, ("\n")); @@ -1419,6 +1420,7 @@ scinit(unit, flags | SC_KERNEL_CONSOLE); sc_console_unit = unit; sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]); + sc_consptr = cp; #endif /* !__alpha__ */ #if __alpha__ @@ -1474,6 +1476,7 @@ scinit(unit, flags | SC_KERNEL_CONSOLE); sc_console_unit = unit; + sc_consptr = &consdev; sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]); sprintf(consdev.cn_name, "ttyv%r", 0); cnadd(&consdev); @@ -2356,7 +2359,7 @@ sc->switch_in_progress = 0; if (sc->unit == sc_console_unit) - cons_unavail = FALSE; + cnavailable(sc_consptr, TRUE); splx(s); DPRINTF(5, ("switch done\n")); @@ -2378,7 +2381,7 @@ if (!signal_vt_acq(sc->cur_scp)) { sc->switch_in_progress = 0; if (sc->unit == sc_console_unit) - cons_unavail = FALSE; + cnavailable(sc_consptr, TRUE); } return s; @@ -2420,7 +2423,7 @@ if (scp->smode.mode != VT_PROCESS) return FALSE; if (scp->sc->unit == sc_console_unit) - cons_unavail = TRUE; + cnavailable(sc_consptr, FALSE); scp->status |= SWITCH_WAIT_ACQ; PROC_LOCK(scp->proc); psignal(scp->proc, scp->smode.acqsig); ==== //depot/projects/smpng/sys/dev/usb/umass.c#35 (text+ko) ==== @@ -24,10 +24,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.102 2004/02/02 14:58:14 sanpei Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.103 2004/02/06 14:38:14 sanpei Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ +/* Also already merged from NetBSD: + * $NetBSD: umass.c,v 1.67 2001/11/25 19:05:22 augustss Exp $ + * $NetBSD: umass.c,v 1.90 2002/11/04 19:17:33 pooka Exp $ + * $NetBSD: umass.c,v 1.108 2003/11/07 17:03:25 wiz Exp $ + * $NetBSD: umass.c,v 1.109 2003/12/04 13:57:31 keihan Exp $ + */ + /* * Universal Serial Bus Mass Storage Class specs: * http://www.usb.org/developers/devclass_docs/usb_msc_overview_1.2.pdf @@ -37,8 +44,8 @@ */ /* - * Ported to NetBSD by Lennart Augustsson <augustss@netbsd.org>. - * Parts of the code written my Jason R. Thorpe <thorpej@shagadelic.org>. + * Ported to NetBSD by Lennart Augustsson <augustss@NetBSD.org>. + * Parts of the code written by Jason R. Thorpe <thorpej@shagadelic.org>. */ /* ==== //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#18 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.63 2003/12/15 00:44:05 grog Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.64 2004/02/04 22:29:52 le Exp $"); #define STATIC static @@ -1281,7 +1281,9 @@ int namedplexno; enum plexstate state = plex_init; /* state to set at end */ int preferme; /* set if we want to be preferred access */ + int stripesize; + stripesize = 0; current_plex = -1; /* forget the previous plex */ preferme = 0; /* nothing special yet */ plexno = get_empty_plex(); /* allocate a plex */ @@ -1339,52 +1341,53 @@ case kw_striped: { - int stripesize = sizespec(token[++parameter]); + plex->organization = plex_striped; - plex->organization = plex_striped; - if (stripesize % DEV_BSIZE != 0) /* not a multiple of block size, */ - throw_rude_remark(EINVAL, "plex %s: stripe size %d not a multiple of sector size", - plex->name, - stripesize); + if (++parameter >= tokens) /* No stripe size specified. */ + stripesize = 0; else - plex->stripesize = stripesize / DEV_BSIZE; + stripesize = sizespec(token[parameter]); + break; } case kw_raid4: { - int stripesize = sizespec(token[++parameter]); + plex->organization = plex_raid4; - plex->organization = plex_raid4; - if (stripesize % DEV_BSIZE != 0) /* not a multiple of block size, */ - throw_rude_remark(EINVAL, "plex %s: stripe size %d not a multiple of sector size", - plex->name, - stripesize); + if (++parameter >= tokens) /* No stripe size specified. */ + stripesize = 0; else - plex->stripesize = stripesize / DEV_BSIZE; + stripesize = sizespec(token[parameter]); + break; } case kw_raid5: { - int stripesize = sizespec(token[++parameter]); + plex->organization = plex_raid5; - plex->organization = plex_raid5; - if (stripesize % DEV_BSIZE != 0) /* not a multiple of block size, */ - throw_rude_remark(EINVAL, "plex %s: stripe size %d not a multiple of sector size", - plex->name, - stripesize); + if (++parameter >= tokens) /* No stripe size specified. */ + stripesize = 0; else - plex->stripesize = stripesize / DEV_BSIZE; + stripesize = sizespec(token[parameter]); + break; } default: throw_rude_remark(EINVAL, "Invalid plex organization"); } - if (isstriped(plex) - && (plex->stripesize == 0)) /* didn't specify a valid stripe size */ - throw_rude_remark(EINVAL, "Need a stripe size parameter"); + if (isstriped(plex)) { + if (stripesize == 0) /* didn't specify a valid stripe size */ + throw_rude_remark(EINVAL, "Need a stripe size parameter"); + else if (stripesize % DEV_BSIZE != 0) + throw_rude_remark(EINVAL, "plex %s: stripe size %d not a multiple of sector size", + plex->name, + stripesize); + else + plex->stripesize = stripesize / DEV_BSIZE; + } break; /* ==== //depot/projects/smpng/sys/dev/zs/zs.c#11 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.15 2003/11/09 09:17:23 tanimura Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.16 2004/02/05 09:49:35 pjd Exp $"); /*- * Copyright (c) 2003 Jake Burkholder. * All rights reserved. @@ -465,7 +465,7 @@ if ((tp->t_state & TS_ISOPEN) != 0 && (tp->t_state & TS_XCLUDE) != 0 && - !suser(td)) + suser(td) != 0) return (EBUSY); if ((tp->t_state & TS_ISOPEN) == 0) { ==== //depot/projects/smpng/sys/i386/conf/NOTES#76 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1122 2004/01/29 21:07:54 schweikh Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1123 2004/02/05 13:02:14 rik Exp $ # # @@ -492,7 +492,8 @@ # ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver # (requires sppp) # ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) -# cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing) +# cx: Cronyx/Sigma multiport sync/async adapter (requires sppp or NETGRAPH, +# depends on NETGRAPH_CRONYX option) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) @@ -524,6 +525,7 @@ hint.cx.0.port="0x240" hint.cx.0.irq="15" hint.cx.0.drq="7" +#options NETGRAPH_CRONYX # Enable NETGRAPH support for Cronyx adapter(s) device ed #options ED_NO_MIIBUS # Disable ed miibus support hint.ed.0.at="isa" ==== //depot/projects/smpng/sys/i386/i386/db_interface.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/db_interface.c,v 1.77 2003/11/08 03:01:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/db_interface.c,v 1.79 2004/02/05 17:35:28 kan Exp $"); /* * Interface to new debugger. @@ -90,7 +90,7 @@ * our breakpoints by disarming our breakpoints and fixing up * %eip. */ - if (cons_unavail && ddb_mode) { + if (cnunavailable() != 0 && ddb_mode) { if (type == T_TRCTRAP) { regs->tf_eflags &= ~PSL_T; return (1); @@ -320,7 +320,7 @@ * OK if the call is for the debugger hotkey but not if the call * is a weak form of panicing. */ - if (cons_unavail && !(boothowto & RB_GDB)) + if (cnunavailable() != 0 && !(boothowto & RB_GDB)) return; if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { ==== //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#12 (text+ko) ==== @@ -50,7 +50,7 @@ * * Last Edit-Date: [Sat Jul 15 15:06:06 2000] * - * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.80 2003/09/26 08:51:54 phk Exp $ + * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.81 2004/02/05 01:56:43 kan Exp $ * *---------------------------------------------------------------------------*/ @@ -673,6 +673,7 @@ int i; pcvt_is_console = 1; + pcvt_consptr = cp; /* * Don't reset the keyboard via `kbdio' just yet. ==== //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#12 (text+ko) ==== @@ -44,7 +44,7 @@ * * Last Edit-Date: [Fri Mar 8 19:57:55 2002] * - * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.30 2004/01/07 10:12:59 joerg Exp $ + * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.32 2004/02/05 10:02:20 roam Exp $ * *---------------------------------------------------------------------------*/ @@ -2385,7 +2385,7 @@ * process mode. */ if(pcvt_is_console) - cons_unavail = 0; + cnavailable(pcvt_consptr, TRUE); } } return 0; @@ -2470,7 +2470,7 @@ * process mode. */ if(pcvt_is_console) - cons_unavail = (newmode.mode == VT_PROCESS); + cnavailable(pcvt_consptr, (newmode.mode != VT_PROCESS)); splx(opri); return 0; @@ -2549,7 +2549,7 @@ /* XXX */ if(pcvt_is_console) - cons_unavail = 0; + cnavailable(pcvt_consptr, TRUE); } return 0; } @@ -2563,7 +2563,7 @@ /* XXX */ if(pcvt_is_console) - cons_unavail = 1; + cnavailable(pcvt_consptr, FALSE); return 0; } ==== //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#5 (text+ko) ==== @@ -41,7 +41,7 @@ * * Last Edit-Date: [Wed Apr 5 18:21:32 2000] * - * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_hdr.h,v 1.48 2003/07/27 14:01:33 robert Exp $ + * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_hdr.h,v 1.49 2004/02/05 01:56:43 kan Exp $ * *---------------------------------------------------------------------------*/ @@ -763,6 +763,7 @@ u_char kbd_polling = 0; /* keyboard is being polled */ u_char reset_keyboard = 0; /* OK to reset keyboard */ keyboard_t *kbd = NULL; +struct consdev *pcvt_consptr = NULL; #if PCVT_SHOWKEYS u_char keyboard_show = 0; /* normal display */ @@ -899,6 +900,7 @@ extern u_char kbd_polling; extern u_char reset_keyboard; extern keyboard_t *kbd; +extern struct consdev *pcvt_consptr; #if PCVT_SHOWKEYS extern u_char keyboard_show; ==== //depot/projects/smpng/sys/kern/kern_fork.c#72 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.213 2004/02/04 21:52:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.214 2004/02/05 21:01:37 jhb Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402061823.i16INWlg097114>