From owner-p4-projects@FreeBSD.ORG Sat Jul 3 04:17:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1484216A4D0; Sat, 3 Jul 2004 04:17:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C15B816A4CE for ; Sat, 3 Jul 2004 04:17:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79C7943D41 for ; Sat, 3 Jul 2004 04:17:04 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i634H4TF069153 for ; Sat, 3 Jul 2004 04:17:04 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i634H3sm069150 for perforce@freebsd.org; Sat, 3 Jul 2004 04:17:03 GMT (envelope-from julian@freebsd.org) Date: Sat, 3 Jul 2004 04:17:03 GMT Message-Id: <200407030417.i634H3sm069150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 56366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2004 04:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=56366 Change 56366 by julian@julian_jules1 on 2004/07/03 04:16:48 IFC to get jhb's last changes Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/interrupt.c#3 integrate .. //depot/projects/nsched/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/nsched/sys/alpha/include/param.h#3 integrate .. //depot/projects/nsched/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/nsched/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/nsched/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/nsched/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/nsched/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/nsched/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/nsched/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/nsched/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/nsched/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/nsched/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/nsched/sys/amd64/include/param.h#3 integrate .. //depot/projects/nsched/sys/arm/arm/intr.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/nsched/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/nsched/sys/boot/common/loader.8#4 integrate .. //depot/projects/nsched/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/nsched/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/nsched/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/nsched/sys/conf/NOTES#8 integrate .. //depot/projects/nsched/sys/conf/files#14 integrate .. //depot/projects/nsched/sys/conf/files.amd64#5 integrate .. //depot/projects/nsched/sys/conf/files.i386#7 integrate .. //depot/projects/nsched/sys/conf/files.ia64#4 integrate .. //depot/projects/nsched/sys/conf/kern.post.mk#4 integrate .. //depot/projects/nsched/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#7 integrate .. //depot/projects/nsched/sys/conf/newvers.sh#3 integrate .. //depot/projects/nsched/sys/conf/options#9 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acconfig.h#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acfreebsd.h#5 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acinterp.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evgpe.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_button.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/nsched/sys/dev/acpica/acpi_isab.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_lid.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_powerres.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/nsched/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_resource.c#6 integrate .. //depot/projects/nsched/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/nsched/sys/dev/amr/amr.c#3 integrate .. //depot/projects/nsched/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/nsched/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/nsched/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#8 integrate .. //depot/projects/nsched/sys/dev/cy/cy.c#8 integrate .. //depot/projects/nsched/sys/dev/digi/digi.c#8 integrate .. //depot/projects/nsched/sys/dev/em/if_em.c#5 integrate .. //depot/projects/nsched/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/nsched/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/nsched/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/nsched/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/nsched/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/nsched/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/nsched/sys/dev/pci/pci.c#6 integrate .. //depot/projects/nsched/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/nsched/sys/dev/puc/puc.c#2 integrate .. //depot/projects/nsched/sys/dev/random/randomdev.c#6 integrate .. //depot/projects/nsched/sys/dev/rc/rc.c#6 integrate .. //depot/projects/nsched/sys/dev/re/if_re.c#5 integrate .. //depot/projects/nsched/sys/dev/sab/sab.c#5 integrate .. //depot/projects/nsched/sys/dev/sio/sio.c#8 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/nsched/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/nsched/sys/dev/usb/devlist2h.awk#3 delete .. //depot/projects/nsched/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/ubser.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/umass.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/umct.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/ums.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/urio.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs.h#7 delete .. //depot/projects/nsched/sys/dev/usb/usbdevs_data.h#7 delete .. //depot/projects/nsched/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/nsched/sys/dev/xe/if_xe_pccard.c#5 integrate .. //depot/projects/nsched/sys/dev/zs/zs.c#6 integrate .. //depot/projects/nsched/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/nsched/sys/geom/geom_disk.c#4 integrate .. //depot/projects/nsched/sys/geom/geom_io.c#4 integrate .. //depot/projects/nsched/sys/geom/geom_slice.c#3 integrate .. //depot/projects/nsched/sys/geom/label/g_label.c#1 branch .. //depot/projects/nsched/sys/geom/label/g_label.h#1 branch .. //depot/projects/nsched/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/nsched/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/nsched/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/nsched/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_toshiba.c#6 integrate .. //depot/projects/nsched/sys/i386/conf/NOTES#7 integrate .. //depot/projects/nsched/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/mem.c#5 integrate .. //depot/projects/nsched/sys/i386/i386/mptable.c#5 integrate .. //depot/projects/nsched/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/nsched/sys/i386/include/float.h#4 integrate .. //depot/projects/nsched/sys/i386/include/param.h#3 integrate .. //depot/projects/nsched/sys/i386/include/pmap.h#6 integrate .. //depot/projects/nsched/sys/i386/include/proc.h#3 integrate .. //depot/projects/nsched/sys/i386/isa/isa.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/nsched/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/nsched/sys/i386/pci/pci_pir.c#5 integrate .. //depot/projects/nsched/sys/ia64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/nsched/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/nsched/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_clock.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_idle.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_intr.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_jail.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_linker.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_poll.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_subr.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_synch.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_thr.c#8 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#27 integrate .. //depot/projects/nsched/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/nsched/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#20 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#10 integrate .. //depot/projects/nsched/sys/kern/subr_bus.c#5 integrate .. //depot/projects/nsched/sys/kern/subr_prof.c#4 integrate .. //depot/projects/nsched/sys/kern/subr_rman.c#3 integrate .. //depot/projects/nsched/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/nsched/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/nsched/sys/kern/subr_trap.c#2 integrate .. //depot/projects/nsched/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/nsched/sys/kern/sys_process.c#2 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#4 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#4 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/nsched/sys/modules/Makefile#6 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ahb/Makefile#1 branch .. //depot/projects/nsched/sys/modules/aue/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/axe/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/cue/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ep/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/geom/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/geom/geom_label/Makefile#1 branch .. //depot/projects/nsched/sys/modules/kue/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/rue/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ubsa/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ucom/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/udav/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/udbp/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ufm/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/uftdi/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ugen/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/uhid/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ulpt/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/umass/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/umct/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/umodem/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ums/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/uplcom/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/urio/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/usb/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/uscanner/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/uvisor/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/uvscom/Makefile#2 integrate .. //depot/projects/nsched/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/nsched/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/nsched/sys/net/if_loop.c#5 integrate .. //depot/projects/nsched/sys/net/if_spppsubr.c#5 integrate .. //depot/projects/nsched/sys/net/if_tun.c#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/nsched/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.h#2 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/nsched/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/nsched/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/nsched/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/nsched/sys/pc98/pc98/sio.c#8 integrate .. //depot/projects/nsched/sys/pci/agp_via.c#5 integrate .. //depot/projects/nsched/sys/pci/if_dc.c#5 integrate .. //depot/projects/nsched/sys/pci/if_dcreg.h#2 integrate .. //depot/projects/nsched/sys/pci/if_de.c#4 integrate .. //depot/projects/nsched/sys/pci/if_pcn.c#4 integrate .. //depot/projects/nsched/sys/pci/if_rl.c#6 integrate .. //depot/projects/nsched/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/nsched/sys/pci/if_sf.c#4 integrate .. //depot/projects/nsched/sys/pci/if_sis.c#5 integrate .. //depot/projects/nsched/sys/pci/if_sk.c#5 integrate .. //depot/projects/nsched/sys/pci/if_ste.c#7 integrate .. //depot/projects/nsched/sys/pci/if_vr.c#6 integrate .. //depot/projects/nsched/sys/pci/if_wb.c#4 integrate .. //depot/projects/nsched/sys/pci/if_xl.c#5 integrate .. //depot/projects/nsched/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/nsched/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/pmap.c#4 integrate .. //depot/projects/nsched/sys/powerpc/psim/iobus.c#3 integrate .. //depot/projects/nsched/sys/powerpc/psim/iobusvar.h#2 integrate .. //depot/projects/nsched/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/nsched/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/nsched/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/nsched/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/nsched/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/bus_machdep.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/nsched/sys/sys/interrupt.h#2 integrate .. //depot/projects/nsched/sys/sys/param.h#8 integrate .. //depot/projects/nsched/sys/sys/proc.h#17 integrate .. //depot/projects/nsched/sys/sys/resourcevar.h#3 integrate .. //depot/projects/nsched/sys/sys/rman.h#3 integrate .. //depot/projects/nsched/sys/sys/sched.h#8 integrate .. //depot/projects/nsched/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/nsched/sys/sys/socketvar.h#7 integrate .. //depot/projects/nsched/sys/sys/syscall.h#4 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#4 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#4 integrate .. //depot/projects/nsched/sys/sys/thr.h#2 integrate .. //depot/projects/nsched/sys/sys/tty.h#7 integrate .. //depot/projects/nsched/sys/sys/umtx.h#2 integrate .. //depot/projects/nsched/sys/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/nsched/sys/vm/vm_glue.c#5 integrate .. //depot/projects/nsched/sys/vm/vm_map.c#6 integrate .. //depot/projects/nsched/sys/vm/vm_object.c#4 integrate .. //depot/projects/nsched/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.45 2004/07/02 03:47:28 scottl Exp $"); #include #include @@ -66,6 +66,7 @@ int map_count; bus_dma_lock_t *lockfunc; void *lockfuncarg; + bus_dma_segment_t *segments; }; struct bounce_page { @@ -221,7 +222,9 @@ newtag->lockfunc = dflt_lock; newtag->lockfuncarg = NULL; } - + + newtag->segments = NULL; + /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr); @@ -290,6 +293,8 @@ parent = dmat->parent; atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); free(dmat, M_DEVBUF); /* * Last reference count, so @@ -332,6 +337,14 @@ return (0); } + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if (dmat->lowaddr < ptoa(Maxmem)) { /* Must bounce */ int maxpages; @@ -425,6 +438,14 @@ /* If we succeed, no mapping/bouncing will be required */ *mapp = &nobounce_dmamap; + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -477,11 +498,6 @@ { vm_offset_t vaddr; vm_offset_t paddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif bus_dma_segment_t *sg; int seg; int error; @@ -496,16 +512,16 @@ * of the bus address space. */ vaddr = trunc_page((vm_offset_t) buf); - dm_segments[0].ds_addr = + dmat->segments[0].ds_addr = map->busaddress + (vm_offset_t) buf - vaddr; - dm_segments[0].ds_len = buflen; + dmat->segments[0].ds_len = buflen; buflen = round_page((vm_offset_t) buf + buflen) - vaddr; sgmap_load_region(chipset.sgmap, map->busaddress, vaddr, buflen); map->buflen = buflen; - (*callback)(callback_arg, dm_segments, 1, error); + (*callback)(callback_arg, dmat->segments, 1, error); return (0); } @@ -560,7 +576,7 @@ } vaddr = (vm_offset_t)buf; - sg = &dm_segments[0]; + sg = &dmat->segments[0]; seg = 1; sg->ds_len = 0; @@ -604,7 +620,7 @@ error = EFBIG; } - (*callback)(callback_arg, dm_segments, seg, error); + (*callback)(callback_arg, dmat->segments, seg, error); return (0); } @@ -617,7 +633,6 @@ */ static int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, - bus_dma_segment_t segs[], void *buf, bus_size_t buflen, struct thread *td, int flags, @@ -625,12 +640,15 @@ int *segp, int first) { + bus_dma_segment_t *segs; bus_size_t sgsize; bus_addr_t curaddr, lastaddr, baddr, bmask; vm_offset_t vaddr = (vm_offset_t)buf; int seg; pmap_t pmap; + segs = dmat->segments; + if (td != NULL) pmap = vmspace_pmap(td->td_proc->p_vmspace); else @@ -709,11 +727,6 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error; KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, @@ -730,7 +743,6 @@ for (m = m0; m != NULL && error == 0; m = m->m_next) { if (m->m_len > 0) { error = _bus_dmamap_load_buffer(dmat, - dm_segments, m->m_data, m->m_len, NULL, flags, &lastaddr, &nsegs, first); @@ -743,9 +755,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } return (error); @@ -761,11 +773,6 @@ int flags) { bus_addr_t lastaddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; @@ -796,9 +803,7 @@ caddr_t addr = (caddr_t) iov[i].iov_base; if (minlen > 0) { - error = _bus_dmamap_load_buffer(dmat, - dm_segments, - addr, minlen, + error = _bus_dmamap_load_buffer(dmat, addr, minlen, td, flags, &lastaddr, &nsegs, first); first = 0; @@ -808,9 +813,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, uio->uio_resid, error); } return (error); ==== //depot/projects/nsched/sys/alpha/alpha/interrupt.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.78 2004/04/16 20:09:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.79 2004/07/02 20:21:41 jhb Exp $"); #include #include @@ -455,7 +455,7 @@ * thread to the current CPU until we return from the interrupt. */ sched_pin(); - error = ithread_schedule(ithd, !cold); + error = ithread_schedule(ithd); KASSERT(error == 0, ("got an impossible stray interrupt")); sched_unpin(); } ==== //depot/projects/nsched/sys/alpha/alpha/sgmap.c#2 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/include/param.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.33 2004/04/05 21:00:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.34 2004/07/02 20:21:41 jhb Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -113,6 +113,8 @@ #define SSIZE 1 /* initial stack size/NBPG */ #define SINCR 1 /* increment of stack/NBPG */ +#define PREEMPTION + #ifndef KSTACK_PAGES #define KSTACK_PAGES 2 /* pages of kstack (with pcb) */ #endif ==== //depot/projects/nsched/sys/alpha/isa/isa.c#2 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/mcbus/mcpcia.c#2 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.29 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/pci/apecs.c#2 (text+ko) ==== @@ -55,8 +55,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.25 2003/12/23 02:36:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.26 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/pci/cia.c#2 (text+ko) ==== @@ -87,10 +87,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.43 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/pci/pcibus.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.33 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.34 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_isa.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/pci/t2.c#2 (text+ko) ==== @@ -51,8 +51,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.21 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/pci/tsunami.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.24 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/pci/tsunami_pci.c#2 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.16 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.17 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/alpha/tlsb/dwlpx.c#2 (text+ko) ==== @@ -56,8 +56,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.26 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.27 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $"); #include #include @@ -56,3 +56,9 @@ intr_model = model; } + +int +acpi_machdep_quirks(int *quirks) +{ + return (0); +} ==== //depot/projects/nsched/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.6 2004/05/30 04:49:39 alc Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.7 2004/07/02 20:21:41 jhb Exp $ */ /* @@ -215,7 +215,7 @@ if (ih == NULL) error = EINVAL; else - error = ithread_schedule(it, !cold); + error = ithread_schedule(it); } if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); ==== //depot/projects/nsched/sys/amd64/amd64/nexus.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.61 2004/06/30 19:24:26 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -41,6 +41,7 @@ * and I/O memory address space. */ +#define __RMAN_RESOURCE_VISIBLE #include "opt_isa.h" #include ==== //depot/projects/nsched/sys/amd64/include/param.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.11 2004/06/07 23:47:59 peter Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.12 2004/07/02 20:21:41 jhb Exp $ */ /* @@ -119,6 +119,8 @@ #define NBPML4 (1ul< -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.2 2004/07/02 22:30:42 cognet Exp $"); #include #include #include @@ -143,7 +143,7 @@ */ } } else if (ih) { - ithread_schedule(ithd, !cold); + ithread_schedule(ithd); } } } ==== //depot/projects/nsched/sys/arm/arm/nexus.c#3 (text+ko) ==== @@ -40,8 +40,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.2 2004/05/22 13:15:14 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.3 2004/07/02 22:30:10 cognet Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/arm/arm/sys_machdep.c#2 (text+ko) ==== @@ -34,21 +34,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); - -#include "opt_kstack_pages.h" -#include "opt_mac.h" +__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.2 2004/06/28 11:35:05 cognet Exp $"); #include #include -#include -#include -#include -#include #include -#include #include -#include #include #include ==== //depot/projects/nsched/sys/arm/sa11x0/sa11x0.c#3 (text+ko) ==== @@ -57,8 +57,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.2 2004/06/19 17:38:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.3 2004/07/02 22:30:10 cognet Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/nsched/sys/boot/common/loader.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.60 2004/05/16 22:51:35 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.61 2004/07/02 21:49:22 ru Exp $ .\" .Dd January 27, 2004 .Dt LOADER 8 @@ -586,9 +586,9 @@ .Ic catch or .Ic execute -is processed +is processed! .Ef -\&! This is particularly annoying for programs that want or need to +This is particularly annoying for programs that want or need to handle exceptions. In this case, the use of a proxy is recommended. For example: ==== //depot/projects/nsched/sys/boot/common/newvers.sh#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $ # $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -33,7 +33,7 @@ # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 LC_ALL=C; export LC_ALL -u=${USER-root} h=`hostname` t=`date` +u=${USER-root} h=${HOSTNAME-`hostname`} t=`date` #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '` r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.16 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.17 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.26 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.27 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #include "opt_compat.h" ==== //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -595,10 +595,10 @@ 428 UNIMPL __acl_aclcheck_link ; XXX implement 429 UNIMPL sigwait -430 MNOPROTO { int thr_create(ucontext_t *ctx, thr_id_t *id, int flag s); } +430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } 431 MNOPROTO { void thr_exit(void); } -432 MNOPROTO { int thr_self(thr_id_t *id); } -433 MNOPROTO { int thr_kill(thr_id_t id, int sig); } +432 MNOPROTO { int thr_self(long *id); } +433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO { int jail_attach(int jid); } @@ -608,4 +608,4 @@ 440 UNIMPL kse_switchin 441 UNIMPL ksem_timedwait >>> TRUNCATED FOR MAIL (1000 lines) <<<