Date: Mon, 28 Jul 2003 11:47:42 -0700 (PDT) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 35135 for review Message-ID: <200307281847.h6SIlglv025773@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=35135 Change 35135 by sam@sam_ebb on 2003/07/28 11:47:24 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/include/alpha_cpu.h#2 integrate .. //depot/projects/netperf/sys/alpha/include/bus.h#2 integrate .. //depot/projects/netperf/sys/alpha/include/ucontext.h#2 integrate .. //depot/projects/netperf/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/amd64-gdbstub.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/atomic.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/critical.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_genassym.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_misc.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/netperf/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/netperf/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/netperf/sys/amd64/isa/intr_machdep.c#2 integrate .. //depot/projects/netperf/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/netperf/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/netperf/sys/amd64/isa/ithread.c#2 integrate .. //depot/projects/netperf/sys/amd64/isa/npx.c#2 integrate .. //depot/projects/netperf/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/netperf/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/netperf/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/netperf/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/netperf/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/netperf/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/netperf/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/netperf/sys/conf/kmod.mk#2 integrate .. //depot/projects/netperf/sys/conf/newvers.sh#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/ath/ah.h#2 edit .. //depot/projects/netperf/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 edit .. //depot/projects/netperf/sys/contrib/dev/ath/version.h#2 edit .. //depot/projects/netperf/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#2 edit .. //depot/projects/netperf/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/netperf/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/netperf/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/netperf/sys/dev/md/md.c#2 integrate .. //depot/projects/netperf/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs.h#2 integrate .. //depot/projects/netperf/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/netperf/sys/dev/rp/rp.c#2 integrate .. //depot/projects/netperf/sys/dev/usb/umass.c#2 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/netperf/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/netperf/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/netperf/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/netperf/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/netperf/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/mpapic.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/netperf/sys/i386/include/apic.h#2 integrate .. //depot/projects/netperf/sys/i386/include/asm.h#2 integrate .. //depot/projects/netperf/sys/i386/include/bus_dma.h#2 integrate .. //depot/projects/netperf/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/netperf/sys/i4b/capi/iavc/iavc.h#2 integrate .. //depot/projects/netperf/sys/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/netperf/sys/ia64/conf/SKI#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/netperf/sys/ia64/include/_regset.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/bus.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/cpu.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/setjmp.h#2 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_acct.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_alq.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_exec.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_linker.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_sig.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/netperf/sys/kern/link_elf.c#2 integrate .. //depot/projects/netperf/sys/kern/subr_mbuf.c#3 integrate .. //depot/projects/netperf/sys/kern/tty_cons.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#2 edit .. //depot/projects/netperf/sys/kern/vfs_export.c#3 integrate .. //depot/projects/netperf/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/netperf/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/netperf/sys/kern/vnode_if.src#2 integrate .. //depot/projects/netperf/sys/libkern/scanc.c#2 integrate .. //depot/projects/netperf/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/netperf/sys/netatm/atm_cm.c#2 integrate .. //depot/projects/netperf/sys/netatm/atm_device.c#2 integrate .. //depot/projects/netperf/sys/netatm/atm_if.c#2 integrate .. //depot/projects/netperf/sys/netatm/atm_ioctl.h#2 integrate .. //depot/projects/netperf/sys/netatm/atm_proto.c#2 integrate .. //depot/projects/netperf/sys/netatm/atm_socket.c#2 integrate .. //depot/projects/netperf/sys/netatm/atm_subr.c#2 integrate .. //depot/projects/netperf/sys/netatm/atm_var.h#2 integrate .. //depot/projects/netperf/sys/netatm/ipatm/ipatm_input.c#2 integrate .. //depot/projects/netperf/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/netperf/sys/netatm/ipatm/ipatm_output.c#2 integrate .. //depot/projects/netperf/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate .. //depot/projects/netperf/sys/netatm/ipatm/ipatm_var.h#2 integrate .. //depot/projects/netperf/sys/netatm/ipatm/ipatm_vcm.c#2 integrate .. //depot/projects/netperf/sys/netatm/spans/spans_cls.c#2 integrate .. //depot/projects/netperf/sys/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/netperf/sys/netatm/spans/spans_var.h#2 integrate .. //depot/projects/netperf/sys/netatm/uni/sscf_uni.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/sscf_uni_var.h#2 integrate .. //depot/projects/netperf/sys/netatm/uni/sscop_pdu.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/sscop_var.h#2 integrate .. //depot/projects/netperf/sys/netatm/uni/uniarp.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/uniarp_cache.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/uniarp_input.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/uniarp_vcm.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/uniip_var.h#2 integrate .. //depot/projects/netperf/sys/netatm/uni/unisig_decode.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/unisig_msg.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/unisig_subr.c#2 integrate .. //depot/projects/netperf/sys/netatm/uni/unisig_var.h#2 integrate .. //depot/projects/netperf/sys/netatm/uni/unisig_vc_state.c#2 integrate .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#2 edit .. //depot/projects/netperf/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/netperf/sys/netncp/ncp_ncp.c#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_usr.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/netperf/sys/pci/if_dc.c#2 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#2 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#2 integrate .. //depot/projects/netperf/sys/pci/if_xl.c#2 integrate .. //depot/projects/netperf/sys/pci/ncr.c#2 integrate .. //depot/projects/netperf/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/netperf/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/netperf/sys/sys/cdefs.h#2 integrate .. //depot/projects/netperf/sys/sys/vnode.h#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/netperf/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/netperf/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#2 integrate .. //depot/projects/netperf/sys/vm/uma_core.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_contig.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_kern.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_object.c#2 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.42 2003/07/01 21:20:51 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -413,24 +413,29 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp) { + int mflags; + + if (flags & BUS_DMA_NOWAIT) + mflags = M_NOWAIT; + else + mflags = M_WAITOK; + if (flags & BUS_DMA_ZERO) + mflags |= M_ZERO; + /* If we succeed, no mapping/bouncing will be required */ *mapp = &nobounce_dmamap; if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) { - *vaddr = malloc(dmat->maxsize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK); + *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { /* * XXX Use Contigmalloc until it is merged into this facility * and handles multi-seg allocations. Nobody is doing * multi-seg allocations yet though. */ - mtx_lock(&Giant); - *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK, + *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, mflags, 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); - mtx_unlock(&Giant); } if (*vaddr == NULL) return (ENOMEM); @@ -894,13 +899,11 @@ if (bpage == NULL) break; - mtx_lock(&Giant); bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0ul, dmat->lowaddr, PAGE_SIZE, dmat->boundary); - mtx_unlock(&Giant); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/netperf/sys/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.205 2003/07/15 00:11:03 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.208 2003/07/27 23:45:47 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -548,6 +548,9 @@ alpha_pal_wrmces(alpha_pal_rdmces() & ~(ALPHA_MCES_DSC|ALPHA_MCES_DPC)); + /* Clear userland thread pointer */ + alpha_pal_wrunique(0); + /* * Find out what hardware we're on, and do basic initialization. */ @@ -2024,8 +2027,11 @@ * When the thread is the current thread, the user stack pointer * is not in the PCB; it must be read from the PAL. */ - if (td == curthread) + if (td == curthread) { mcp->mc_regs[FRAME_SP] = alpha_pal_rdusp(); + mcp->mc_thrptr = alpha_pal_rdunique(); + } else + mcp->mc_thrptr = 0; mcp->mc_format = _MC_REV0_TRAPFRAME; PROC_LOCK(curthread->td_proc); @@ -2047,6 +2053,12 @@ else if ((ret = set_fpcontext(td, mcp)) != 0) return (ret); + /* + * NOTE: We only need to restore mc_thrptr when the ucontext format + * is _MC_REV0_TRAPFRAME. Only get_mcontext() above creates such + * contexts and that's also the only place where we save the thread + * pointer in the context. + */ if (mcp->mc_format == _MC_REV0_SIGFRAME) { set_regs(td, (struct reg *)&mcp->mc_regs); val = (mcp->mc_regs[R_PS] | ALPHA_PSL_USERSET) & @@ -2056,10 +2068,12 @@ td->td_frame->tf_regs[FRAME_FLAGS] = 0; if (td == curthread) alpha_pal_wrusp(mcp->mc_regs[R_SP]); - } else { - if (td == curthread) + if (td == curthread) { alpha_pal_wrusp(mcp->mc_regs[FRAME_SP]); + alpha_pal_wrunique(mcp->mc_thrptr); + } + /* * The context is a trapframe, so just copy it over the * threads frame. @@ -2361,9 +2375,3 @@ pcpu->pc_idlepcb.apcb_ptbr = thread0.td_pcb->pcb_hw.apcb_ptbr; pcpu->pc_current_asngen = 1; } - -intptr_t -casuptr(intptr_t *p, intptr_t old, intptr_t new) -{ - return (-1); -} ==== //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.44 2003/07/03 14:33:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.45 2003/07/27 23:45:48 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -137,6 +137,9 @@ */ alpha_pal_wrval((u_int64_t) pcpup); + /* Clear userland thread pointer. */ + alpha_pal_wrunique(0); + /* * Point interrupt/exception vectors to our own. */ ==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#2 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.130 2003/07/06 20:32:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.131 2003/07/25 18:58:39 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2130,7 +2130,7 @@ mpte = NULL; for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t lobject; + vm_object_t backing_object, lobject; pt_entry_t *pte; addr = addra + pmap_prefault_pageorder[i]; @@ -2150,15 +2150,18 @@ pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; lobject = object; - for (m = vm_page_lookup(lobject, pindex); - (!m && (lobject->type == OBJT_DEFAULT) && (lobject->backing_object)); - lobject = lobject->backing_object) { + VM_OBJECT_LOCK(lobject); + while ((m = vm_page_lookup(lobject, pindex)) == NULL && + lobject->type == OBJT_DEFAULT && + (backing_object = lobject->backing_object) != NULL) { if (lobject->backing_object_offset & PAGE_MASK) break; - pindex += (lobject->backing_object_offset >> PAGE_SHIFT); - m = vm_page_lookup(lobject->backing_object, pindex); + pindex += lobject->backing_object_offset >> PAGE_SHIFT; + VM_OBJECT_LOCK(backing_object); + VM_OBJECT_UNLOCK(lobject); + lobject = backing_object; } - + VM_OBJECT_UNLOCK(lobject); /* * give-up when a page is not in memory */ ==== //depot/projects/netperf/sys/alpha/alpha/support.s#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.14 2003/06/29 17:14:42 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.15 2003/07/24 07:49:45 marcel Exp $ */ /* @@ -59,7 +59,35 @@ .text /**************************************************************************/ - + +/* + * intptr_t + * casuptr(intptr_t *p, intptr_t old, intptr_t new) + */ + LEAF(casuptr, 3) + LDGP(pv) + + ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ + cmpult a0, t0, t1 + beq t1, fusufault + + lda t0, fusufault /* trap faults */ + ldq t2, PC_CURTHREAD(pcpup) + ldq t2, TD_PCB(t2) + + stq t0, PCB_ONFAULT(t2) +1: + ldq_l v0, 0(a0) /* try to load the old value */ + cmpeq v0, a1, t0 /* compare */ + beq t0, 2f /* exit if not equal */ + mov a2, t0 /* setup value to write */ + stq_c t0, 0(a0) /* write if address still locked */ + beq t0, 1b /* if it failed, spin */ +2: + stq zero, PCB_ONFAULT(t2) /* clean up */ + RET + END(casuptr) + /* * fu{byte,word} : fetch a byte (word) from user memory */ ==== //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#2 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.88 2003/06/15 00:54:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.89 2003/07/27 23:45:48 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -145,6 +145,7 @@ */ bcopy(td1->td_pcb, td2->td_pcb, sizeof(struct pcb)); td2->td_pcb->pcb_hw.apcb_usp = alpha_pal_rdusp(); + td2->td_pcb->pcb_hw.apcb_unique = 0; td2->td_pcb->pcb_hw.apcb_flags &= ~ALPHA_PCB_FLAGS_FEN; /* ==== //depot/projects/netperf/sys/alpha/include/alpha_cpu.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.9 2002/10/25 20:22:12 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.10 2003/07/24 07:41:08 marcel Exp $ */ /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */ /* @@ -459,6 +459,23 @@ } static __inline void +alpha_pal_wrunique(u_int64_t tp) +{ + register u_int64_t a0 __asm__("$16") = tp; + __asm__ __volatile__("call_pal 0x9f # PAL_wrunique" + : "+r" (a0) : : "$1", "$22", "$23", "$24", "$25"); +} + +static __inline u_int64_t +alpha_pal_rdunique(void) +{ + register u_int64_t v0 __asm__("$0"); + __asm__ __volatile__("call_pal 0x9e # PAL_rdunique" + : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25"); + return (v0); +} + +static __inline void alpha_pal_tbi(u_int64_t op, u_int64_t va) { register u_int64_t a0 __asm__("$16") = op; ==== //depot/projects/netperf/sys/alpha/include/bus.h#2 (text+ko) ==== @@ -67,7 +67,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/alpha/include/bus.h,v 1.22 2003/07/01 15:51:50 scottl Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.23 2003/07/27 13:52:09 mux Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -470,6 +470,7 @@ #define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ #define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ +#define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */ #define BUS_DMA_ISA 0x10 /* map memory for ISA dma */ #define BUS_DMA_BUS2 0x20 /* placeholders for bus functions... */ #define BUS_DMA_BUS3 0x40 ==== //depot/projects/netperf/sys/alpha/include/ucontext.h#2 (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/alpha/include/ucontext.h,v 1.6 2002/11/16 06:35:51 deischen Exp $ + * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.7 2003/07/24 07:34:31 marcel Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -50,7 +50,8 @@ #define _MC_REV0_SIGFRAME 1 /* context is a signal frame */ #define _MC_REV0_TRAPFRAME 2 /* context is a trap frame */ long mc_format; - long mc_spare[6]; + long mc_thrptr; /* Thread pointer */ + long mc_spare[5]; } mcontext_t; #if defined(_KERNEL) && defined(COMPAT_FREEBSD4) ==== //depot/projects/netperf/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (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/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.10 2003/07/25 21:10:18 obrien Exp $"); + /* * 6.1 : Environmental support */ ==== //depot/projects/netperf/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/amd64/acpica/acpi_machdep.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.10 2003/07/25 21:10:19 obrien Exp $"); + #include <sys/param.h> #include <sys/bus.h> ==== //depot/projects/netperf/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ==== @@ -23,9 +23,11 @@ * LIABILITY, OR TORT (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/amd64/acpica/acpi_wakeup.c,v 1.19 2003/05/01 01:05:21 peter Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.20 2003/07/25 21:10:19 obrien Exp $"); + #include <sys/param.h> #include <sys/bus.h> ==== //depot/projects/netperf/sys/amd64/amd64/amd64-gdbstub.c#2 (text+ko) ==== @@ -92,7 +92,8 @@ * ****************************************************************************/ -/* $FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.24 2003/05/31 22:00:57 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); #include <sys/param.h> #include <sys/reboot.h> ==== //depot/projects/netperf/sys/amd64/amd64/atomic.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/amd64/amd64/atomic.c,v 1.4 2000/09/06 11:21:14 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.5 2003/07/25 21:15:44 obrien Exp $"); + /* This file creates publically callable functions to perform various * simple arithmetic on memory which is atomic in the presence of * interrupts and multiple processors. ==== //depot/projects/netperf/sys/amd64/amd64/autoconf.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.173 2003/05/01 01:05:21 peter Exp $ + * @(#)autoconf.c 7.1 (Berkeley) 5/9/91 */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.174 2003/07/25 21:15:44 obrien Exp $"); + /* * Setup the system to run on the current machine. * ==== //depot/projects/netperf/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.49 2003/07/01 19:16:48 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.50 2003/07/27 13:52:08 mux Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -390,25 +390,30 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp) { + int mflags; + + if (flags & BUS_DMA_NOWAIT) + mflags = M_NOWAIT; + else + mflags = M_WAITOK; + if (flags & BUS_DMA_ZERO) + mflags |= M_ZERO; + /* If we succeed, no mapping/bouncing will be required */ *mapp = NULL; if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) { - *vaddr = malloc(dmat->maxsize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK); + *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { /* * XXX Use Contigmalloc until it is merged into this facility * and handles multi-seg allocations. Nobody is doing * multi-seg allocations yet though. */ - mtx_lock(&Giant); - *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK, + *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, mflags, 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); - mtx_unlock(&Giant); } if (*vaddr == NULL) return (ENOMEM); @@ -809,13 +814,11 @@ if (bpage == NULL) break; - mtx_lock(&Giant); bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0ul, dmat->lowaddr, PAGE_SIZE, dmat->boundary); - mtx_unlock(&Giant); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/netperf/sys/amd64/amd64/critical.c#2 (text+ko) ==== @@ -1,10 +1,11 @@ /*- * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. - * - * $FreeBSD: src/sys/amd64/amd64/critical.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.10 2003/07/25 21:15:44 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/signalvar.h> ==== //depot/projects/netperf/sys/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.26 2002/03/23 14:27:06 bde Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.27 2003/07/25 21:15:44 obrien Exp $"); + /* * Instruction disassembler. */ ==== //depot/projects/netperf/sys/amd64/amd64/db_interface.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.73 2003/05/30 01:01:07 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.74 2003/07/25 21:15:44 obrien Exp $"); + /* * Interface to new debugger. */ ==== //depot/projects/netperf/sys/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.57 2003/05/31 22:02:11 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.58 2003/07/25 21:15:44 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> ==== //depot/projects/netperf/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -31,10 +31,11 @@ * LIABILITY, OR TORT (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/amd64/amd64/dump_machdep.c,v 1.8 2003/05/01 01:05:21 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.9 2003/07/25 21:15:44 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> ==== //depot/projects/netperf/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -21,10 +21,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/amd64/amd64/elf_machdep.c,v 1.15 2003/05/11 22:40:24 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.16 2003/07/25 21:15:44 obrien Exp $"); + #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> ==== //depot/projects/netperf/sys/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.147 2003/05/23 05:04:53 peter Exp $ + * @(#)genassym.c 5.11 (Berkeley) 5/10/91 */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.148 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/netperf/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -38,9 +38,11 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.125 2003/05/27 21:59:56 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.126 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_cpu.h" #include <sys/param.h> ==== //depot/projects/netperf/sys/amd64/amd64/in_cksum.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.3 2001/10/05 18:58:22 dfr Exp $ */ /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */ /* @@ -39,6 +38,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ +__FBSDID("$FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.4 2003/07/25 21:15:44 obrien Exp $"); #include <sys/param.h> #include <sys/mbuf.h> ==== //depot/projects/netperf/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/amd64/amd64/initcpu.c,v 1.45 2003/05/01 01:05:21 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.46 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_cpu.h" #include <sys/param.h> ==== //depot/projects/netperf/sys/amd64/amd64/legacy.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * OR TORT (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/amd64/amd64/legacy.c,v 1.50 2003/05/01 01:05:21 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.51 2003/07/25 21:15:44 obrien Exp $"); + /* * This code implements a system driver for legacy systems that do not * support ACPI or when ACPI support is not present in the kernel. ==== //depot/projects/netperf/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -34,10 +34,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.584 2003/07/15 00:11:03 davidxu Exp $ + * @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.587 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_atalk.h" #include "opt_compat.h" #include "opt_cpu.h" @@ -307,14 +309,17 @@ { struct proc *p; struct thread *td; + struct trapframe *regs; td = curthread; p = td->td_proc; + regs = td->td_frame; PROC_LOCK_ASSERT(p, MA_OWNED); bzero(si, sizeof(*si)); si->si_signo = sig; si->si_code = code; + si->si_addr = (void *)regs->tf_addr; /* XXXKSE fill other fields */ } @@ -1170,7 +1175,7 @@ setidt(0, &IDTVEC(div), SDT_SYSIGT, SEL_KPL, 0); setidt(1, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, 0); setidt(2, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 0); - setidt(3, &IDTVEC(bpt), SDT_SYSIGT, SEL_KPL, 0); + setidt(3, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, 0); setidt(4, &IDTVEC(ofl), SDT_SYSIGT, SEL_KPL, 0); setidt(5, &IDTVEC(bnd), SDT_SYSIGT, SEL_KPL, 0); setidt(6, &IDTVEC(ill), SDT_SYSIGT, SEL_KPL, 0); ==== //depot/projects/netperf/sys/amd64/amd64/mem.c#2 (text+ko) ==== @@ -36,11 +36,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah $Hdr: mem.c 1.13 89/10/08$ - * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.109 2003/06/22 12:59:43 simokawa Exp $ + * Utah $Hdr: mem.c 1.13 89/10/08$ + * @(#)mem.c 7.2 (Berkeley) 5/9/91 */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.110 2003/07/25 21:15:44 obrien Exp $"); + /* * Memory special file */ ==== //depot/projects/netperf/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * OR TORT (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/amd64/amd64/nexus.c,v 1.53 2003/05/31 21:58:55 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.54 2003/07/25 21:15:44 obrien Exp $"); + /* * This code implements a `root nexus' for Intel Architecture * machines. The function of the root nexus is to serve as an ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -38,8 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.423 2003/07/09 22:59:45 peter Exp $ + * @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -73,6 +72,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307281847.h6SIlglv025773>