Date: Thu, 21 Oct 2004 04:51:58 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 63442 for review Message-ID: <200410210451.i9L4pwY7014779@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63442 Change 63442 by julian@julian_ref on 2004/10/21 04:51:27 IFC@63441 Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/promcons.c#6 integrate .. //depot/projects/nsched/sys/alpha/osf1/osf1_misc.c#5 integrate .. //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#6 integrate .. //depot/projects/nsched/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/nsched/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/nsched/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/nsched/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/nsched/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/nsched/sys/boot/common/help.common#6 integrate .. //depot/projects/nsched/sys/boot/common/loader.8#8 integrate .. //depot/projects/nsched/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/nsched/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/nsched/sys/conf/files#29 integrate .. //depot/projects/nsched/sys/conf/files.i386#10 integrate .. //depot/projects/nsched/sys/conf/files.sparc64#6 integrate .. //depot/projects/nsched/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#10 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_quirks#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/nsched/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/nsched/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/nsched/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/nsched/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/nsched/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/nsched/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/nsched/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/nsched/sys/dev/auxio/auxio.c#1 branch .. //depot/projects/nsched/sys/dev/auxio/auxioreg.h#1 branch .. //depot/projects/nsched/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/nsched/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#13 integrate .. //depot/projects/nsched/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.c#8 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/nsched/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/nsched/sys/dev/digi/digi.c#11 integrate .. //depot/projects/nsched/sys/dev/digi/digi.h#5 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/nsched/sys/dev/em/if_em.c#8 integrate .. //depot/projects/nsched/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/nsched/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/nsched/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/nsched/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/nsched/sys/dev/md/md.c#13 integrate .. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#9 integrate .. //depot/projects/nsched/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/nsched/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/nsched/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/nsched/sys/dev/pci/pci.c#8 integrate .. //depot/projects/nsched/sys/dev/random/harvest.c#4 integrate .. //depot/projects/nsched/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/nsched/sys/dev/rc/rc.c#8 integrate .. //depot/projects/nsched/sys/dev/sab/sab.c#9 integrate .. //depot/projects/nsched/sys/dev/sio/sio.c#13 integrate .. //depot/projects/nsched/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/es1888.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/gusc.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sbc.c#5 integrate .. //depot/projects/nsched/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/nsched/sys/dev/sx/sx.c#7 integrate .. //depot/projects/nsched/sys/dev/sx/sx.h#4 integrate .. //depot/projects/nsched/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/nsched/sys/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/nsched/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/ubser.c#10 integrate .. //depot/projects/nsched/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ugen.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/umass.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/nsched/sys/dev/zs/zs.c#9 integrate .. //depot/projects/nsched/sys/geom/geom_io.c#9 integrate .. //depot/projects/nsched/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/nsched/sys/geom/geom_subr.c#5 integrate .. //depot/projects/nsched/sys/geom/label/g_label.c#8 integrate .. //depot/projects/nsched/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/nsched/sys/i386/bios/apm.c#4 integrate .. //depot/projects/nsched/sys/i386/conf/NOTES#13 integrate .. //depot/projects/nsched/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/nsched/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/nsched/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/nsched/sys/i386/include/pmap.h#9 integrate .. //depot/projects/nsched/sys/i386/isa/npx.c#6 integrate .. //depot/projects/nsched/sys/i386/isa/pbio.c#1 branch .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate .. //depot/projects/nsched/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/nsched/sys/i4b/driver/i4b_ipr.c#5 integrate .. //depot/projects/nsched/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/nsched/sys/ia64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/nsched/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/nsched/sys/ia64/include/acpica_machdep.h#3 integrate .. //depot/projects/nsched/sys/isa/atkbdc_isa.c#3 integrate .. //depot/projects/nsched/sys/isa/isahint.c#2 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/nsched/sys/kern/kern_event.c#10 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#13 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#16 integrate .. //depot/projects/nsched/sys/kern/kern_kse.c#34 integrate .. //depot/projects/nsched/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_proc.c#15 integrate .. //depot/projects/nsched/sys/kern/kern_subr.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#40 integrate .. //depot/projects/nsched/sys/kern/kern_synch.c#18 integrate .. //depot/projects/nsched/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_tc.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_thr.c#20 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#44 integrate .. //depot/projects/nsched/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/nsched/sys/kern/subr_bus.c#10 integrate .. //depot/projects/nsched/sys/kern/subr_kdb.c#6 integrate .. //depot/projects/nsched/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/nsched/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/nsched/sys/kern/subr_witness.c#8 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#6 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#6 integrate .. //depot/projects/nsched/sys/kern/tty.c#13 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#11 integrate .. //depot/projects/nsched/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_mbuf2.c#6 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#10 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/nsched/sys/modules/Makefile#14 integrate .. //depot/projects/nsched/sys/modules/auxio/Makefile#1 branch .. //depot/projects/nsched/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/nsched/sys/modules/netgraph/device/Makefile#2 integrate .. //depot/projects/nsched/sys/net/bpf.c#9 integrate .. //depot/projects/nsched/sys/net/bridge.c#9 integrate .. //depot/projects/nsched/sys/net/bridge.h#2 integrate .. //depot/projects/nsched/sys/net/if.c#15 integrate .. //depot/projects/nsched/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/nsched/sys/net/if_tun.c#6 integrate .. //depot/projects/nsched/sys/net/if_var.h#8 integrate .. //depot/projects/nsched/sys/net/net_osdep.c#2 delete .. //depot/projects/nsched/sys/net/net_osdep.h#2 integrate .. //depot/projects/nsched/sys/net/netisr.c#6 integrate .. //depot/projects/nsched/sys/net/pfil.c#4 integrate .. //depot/projects/nsched/sys/net/raw_cb.c#5 integrate .. //depot/projects/nsched/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/nsched/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/nsched/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.h#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/nsched/sys/netinet/if_ether.c#6 integrate .. //depot/projects/nsched/sys/netinet/in.h#6 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/nsched/sys/netinet/in_proto.c#5 integrate .. //depot/projects/nsched/sys/netinet/in_var.h#4 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/nsched/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/nsched/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/nsched/sys/netinet/ip_input.c#13 integrate .. //depot/projects/nsched/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/nsched/sys/netinet/ip_var.h#7 integrate .. //depot/projects/nsched/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/nsched/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/nsched/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/nsched/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/nsched/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/nsched/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/nsched/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/nsched/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/nsched/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/nsched/sys/netnatm/natm.c#4 integrate .. //depot/projects/nsched/sys/netncp/ncp_ncp.c#2 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/nsched/sys/pc98/pc98/fd.c#7 integrate .. //depot/projects/nsched/sys/pc98/pc98/sio.c#13 integrate .. //depot/projects/nsched/sys/pci/if_de.c#7 integrate .. //depot/projects/nsched/sys/pci/if_sis.c#6 integrate .. //depot/projects/nsched/sys/pci/if_vr.c#9 integrate .. //depot/projects/nsched/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/nsched/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/nsched/sys/sys/conf.h#13 integrate .. //depot/projects/nsched/sys/sys/kse.h#4 integrate .. //depot/projects/nsched/sys/sys/mbuf.h#11 integrate .. //depot/projects/nsched/sys/sys/pbioio.h#1 branch .. //depot/projects/nsched/sys/sys/proc.h#39 integrate .. //depot/projects/nsched/sys/sys/protosw.h#3 integrate .. //depot/projects/nsched/sys/sys/random.h#2 integrate .. //depot/projects/nsched/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/nsched/sys/sys/socketvar.h#9 integrate .. //depot/projects/nsched/sys/sys/syscall.h#6 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#6 integrate .. //depot/projects/nsched/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/nsched/sys/sys/sysctl.h#7 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#6 integrate .. //depot/projects/nsched/sys/sys/thr.h#3 integrate .. //depot/projects/nsched/sys/sys/tty.h#11 integrate .. //depot/projects/nsched/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/nsched/sys/sys/turnstile.h#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_alloc.c#8 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/nsched/sys/ufs/ffs/fs.h#6 integrate .. //depot/projects/nsched/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/nsched/sys/vm/uma_core.c#6 integrate .. //depot/projects/nsched/sys/vm/uma_dbg.c#4 integrate .. //depot/projects/nsched/sys/vm/vm_fault.c#8 integrate .. //depot/projects/nsched/sys/vm/vm_meter.c#5 integrate .. //depot/projects/nsched/sys/vm/vm_page.c#10 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/promcons.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.41 2004/09/17 11:02:53 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.43 2004/10/20 16:22:53 jhb Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -107,12 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/nsched/sys/alpha/osf1/osf1_misc.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.49 2004/10/05 18:51:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.50 2004/10/14 10:43:47 phk Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1772,7 +1772,7 @@ name[1] = KERN_HOSTNAME; mtx_lock(&Giant); retval = userland_sysctl(td, name, 2, uap->buf, &len, - 1, 0, 0, &bytes); + 1, 0, 0, &bytes, 0); mtx_unlock(&Giant); td->td_retval[0] = bytes; return(retval); ==== //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.48 2004/09/17 11:04:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.49 2004/10/18 21:51:24 phk Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -283,12 +283,7 @@ tp = dev->si_tty; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { ==== //depot/projects/nsched/sys/amd64/acpica/acpi_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -61,3 +61,9 @@ { return (0); } + +void +acpi_cpu_c1() +{ + __asm __volatile("sti; hlt"); +} ==== //depot/projects/nsched/sys/amd64/amd64/nexus.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.63 2004/08/24 19:22:54 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.64 2004/10/14 22:36:47 njl Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -259,6 +259,8 @@ retval += bus_print_child_header(bus, child); retval += nexus_print_all_resources(child); + if (device_get_flags(child)) + retval += printf(" flags %#x", device_get_flags(child)); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ return (retval); ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#25 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.507 2004/10/03 20:14:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.508 2004/10/08 08:23:42 alc Exp $"); /* * Manages physical address maps. @@ -1839,7 +1839,7 @@ vm_paddr_t opa; pd_entry_t ptepde; pt_entry_t origpte, newpte; - vm_page_t mpte; + vm_page_t mpte, om; va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC @@ -1881,6 +1881,7 @@ panic("pmap_enter: invalid page directory va=%#lx\n", va); pa = VM_PAGE_TO_PHYS(m); + om = NULL; origpte = *pte; opa = origpte & PG_FRAME; @@ -1921,8 +1922,7 @@ * so we go ahead and sense modify status. */ if (origpte & PG_MANAGED) { - if ((origpte & PG_M) && pmap_track_modified(va)) - vm_page_dirty(m); + om = m; pa |= PG_MANAGED; } goto validate; @@ -1933,10 +1933,17 @@ */ if (opa) { int err; - err = pmap_remove_pte(pmap, pte, va, ptepde); + if (origpte & PG_W) + pmap->pm_stats.wired_count--; + if (origpte & PG_MANAGED) { + om = PHYS_TO_VM_PAGE(opa); + err = pmap_remove_entry(pmap, om, va, ptepde); + } else + err = pmap_unuse_pt(pmap, va, ptepde); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); - } + } else + pmap->pm_stats.resident_count++; /* * Enter on the PV list if part of our managed memory. Note that we @@ -1952,7 +1959,6 @@ /* * Increment counters */ - pmap->pm_stats.resident_count++; if (wired) pmap->pm_stats.wired_count++; @@ -1977,7 +1983,14 @@ * to update the pte. */ if ((origpte & ~(PG_M|PG_A)) != newpte) { - pte_store(pte, newpte | PG_A); + if (origpte & PG_MANAGED) { + origpte = pte_load_store(pte, newpte | PG_A); + if ((origpte & PG_M) && pmap_track_modified(va)) + vm_page_dirty(om); + if (origpte & PG_A) + vm_page_flag_set(om, PG_REFERENCED); + } else + pte_store(pte, newpte | PG_A); if (origpte) { pmap_invalidate_page(pmap, va); } ==== //depot/projects/nsched/sys/amd64/include/acpica_machdep.h#3 (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/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.6 2004/10/11 05:39:15 njl Exp $ */ /****************************************************************************** @@ -73,6 +73,7 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); +void acpi_cpu_c1(void); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/nsched/sys/amd64/include/pmap.h#13 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.124 2004/09/29 19:20:39 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.125 2004/10/08 08:23:43 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -194,15 +194,25 @@ { pt_entry_t r; - r = *ptep; - *ptep = pte; + __asm __volatile( + "xchgq %0,%1" + : "=m" (*ptep), + "=r" (r) + : "1" (pte), + "m" (*ptep)); return (r); } #define pte_load_clear(pte) atomic_readandclear_long(pte) -#define pte_clear(ptep) pte_load_store((ptep), (pt_entry_t)0ULL) -#define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) +static __inline void +pte_store(pt_entry_t *ptep, pt_entry_t pte) +{ + + *ptep = pte; +} + +#define pte_clear(ptep) pte_store((ptep), (pt_entry_t)0ULL) #define pde_store(pdep, pde) pte_store((pdep), (pde)) ==== //depot/projects/nsched/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.109 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); #include "opt_cpu.h" @@ -35,6 +35,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> +#include <sys/sysctl.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -42,6 +43,7 @@ #include <isa/isavar.h> #include <machine/legacyvar.h> #include <machine/pci_cfgreg.h> +#include <machine/resource.h> #include "pcib_if.h" @@ -81,8 +83,8 @@ static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + uint32_t id, uint8_t class, uint8_t subclass, + uint8_t *busnum) { const char *s = NULL; @@ -262,7 +264,38 @@ return ENOENT; } +SYSCTL_DECL(_hw_pci); +static int legacy_host_mem_start = 0x80000000; +/* No TUNABLE_ULONG :-( */ +TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, + &legacy_host_mem_start, 0x80000000, + "Limit the host bridge memory to being above this address. Must be\n\ +set at boot via a tunable."); + +static struct resource * +legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + /* + * If no memory preference is given, use upper 32MB slot most + * bioses use for their memory window. Typically other bridges + * before us get in the way to assert their preferences on memory. + * Hardcoding like this sucks, so a more MD/MI way needs to be + * found to do it. This is typically only used on older laptops + * that don't have pci busses behind pci bridge, so assuming > 32MB + * is liekly OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. + */ + if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) + start = legacy_host_mem_start; + return (bus_generic_alloc_resource(dev, child, type, rid, start, end, + count, flags)); +} + static device_method_t legacy_pcib_methods[] = { /* Device interface */ DEVMETHOD(device_identify, legacy_pcib_identify), @@ -276,7 +309,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/nsched/sys/arm/conf/SIMICS#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.3 2004/09/23 22:53:50 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ machine arm ident SIMICS @@ -40,6 +40,7 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device +options MD_ROOT_SIZE=65535 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server ==== //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#6 (text+ko) ==== @@ -47,7 +47,9 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.4 2004/09/23 22:32:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.5 2004/10/11 14:41:38 cognet Exp $"); + +#include "opt_md.h" #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -131,7 +133,9 @@ struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; -#define MDSIZE 8192 +#ifndef MD_ROOT_SIZE +#error SIMICS needs MD_ROOT and MD_ROOT_SIZE +#endif /* Physical and virtual addresses for some global pages */ vm_paddr_t phys_avail[10]; @@ -218,7 +222,7 @@ fake_preload[i++] = MDROOT_ADDR; fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = MDSIZE * 1024; + fake_preload[i++] = MD_ROOT_SIZE * 1024; fake_preload[i++] = 0; fake_preload[i] = 0; preload_metadata = (void *)fake_preload; @@ -236,7 +240,6 @@ kerneldatasize = (u_int32_t)&end - (u_int32_t)KERNEL_TEXT_BASE; symbolsize = 0; freemempos = (vm_offset_t)round_page(physical_freestart); - printf("freemempos %p\n", (void*)freemempos); memset((void *)freemempos, 0, 256*1024); /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -311,12 +314,10 @@ pmap_map_chunk(l1pagetable, KERNBASE, KERNBASE, (uint32_t)&end - KERNBASE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ - printf("avant irq %p %p\n", (void*)irqstack.pv_va, (void*)irqstack.pv_pa); pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - printf("apres irq\n"); pmap_map_chunk(l1pagetable, md_addr.pv_va, md_addr.pv_pa, - MDSIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + MD_ROOT_SIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, abtstack.pv_va, abtstack.pv_pa, ABT_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa, @@ -365,7 +366,6 @@ * Since the ARM stacks use STMFD etc. we must set r13 to the top end * of the stack memory. */ - printf("init subsystems: stacks\n"); set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); set_stackptr(PSR_ABT32_MODE, ==== //depot/projects/nsched/sys/boot/common/help.common#6 (text+ko) ==== @@ -311,6 +311,18 @@ this option provides a hint as to the actual size of system memory (which will be tested before use). + set hw.{acpi,pci}.host_start_mem=<value> + + Sets the lowest address that the pci code will assign + when it doesn't have other information about the address + to assign (like from a pci bridge). This is only useful + in older systems without a pci bridge. Also, it only + impacts devices that the BIOS doesn't assign to, typically + CardBus bridges. The default <value> is 0x80000000, but + some systems need values like 0xf0000000, 0xfc000000 or + 0xfe000000 may be suitable for older systems (the older + the system, the higher the number typically should be). + set hw.pci.enable_io_modes=<value> Enable PCI resources which are left off by some BIOSes ==== //depot/projects/nsched/sys/boot/common/loader.8#8 (text+ko) ==== @@ -22,9 +22,9 @@ .\" 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.74 2004/10/01 00:15:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ .\" -.Dd October 1, 2004 +.Dd October 15, 2004 .Dt LOADER 8 .Os .Sh NAME @@ -429,6 +429,15 @@ respectively. An invalid suffix will result in the variable being ignored by the kernel. +.It Va hw.pci.host_start_mem , hw.acpi.host_start_mem +When not otherwise constrained, this limits the memory start +address. +The default is 0x80000000 and should be set to at least size of the +memory and not conflict with other resources. +Typically, only systems without PCI bridges need to set this variable +since PCI bridges typically constrain the memory starting address +(and the variable is only used when bridges do not constrain this +address). .It Va hw.pci.enable_io_modes Enable PCI resources which are left off by some BIOSes or are not enabled correctly by the device driver. ==== //depot/projects/nsched/sys/cam/scsi/scsi_da.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.5 2000/05/21 23:57:52 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ */ #ifndef _SCSI_SCSI_DA_H @@ -151,6 +151,9 @@ #define REASSIGN_BLOCKS 0x07 #define MODE_SELECT 0x15 #define MODE_SENSE 0x1a +#define READ_FORMAT_CAPACITIES 0x23 +#define WRITE_AND_VERIFY 0x2e +#define VERIFY 0x2f #define READ_DEFECT_DATA_10 0x37 #define READ_DEFECT_DATA_12 0xb7 @@ -182,6 +185,82 @@ u_int8_t pat_length[2]; }; +struct scsi_read_format_capacities +{ + uint8_t opcode; /* READ_FORMAT_CAPACITIES */ + uint8_t byte2; +#define SRFC_LUN_MASK 0xE0 + uint8_t reserved0[5]; + uint8_t alloc_length[2]; + uint8_t reserved1[3]; +}; + +struct scsi_verify +{ + uint8_t opcode; /* VERIFY */ + uint8_t byte2; +#define SVFY_LUN_MASK 0xE0 +#define SVFY_RELADR 0x01 +#define SVFY_BYTECHK 0x02 +#define SVFY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to verify */ + uint8_t reserved1[3]; +}; + +struct scsi_write_and_verify +{ + uint8_t opcode; /* WRITE_AND_VERIFY */ + uint8_t byte2; +#define SWVY_LUN_MASK 0xE0 +#define SWVY_RELADR 0x01 +#define SWVY_BYTECHK 0x02 +#define SWVY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to write and verify */ + uint8_t reserved1[3]; +}; + +/* + * Replies to READ_FORMAT_CAPACITIES look like this: + * + * struct format_capacity_list_header + * struct format_capacity_descriptor[1..n] + * + * These are similar, but not totally identical to, the + * defect list used to format a rigid disk. + * + * The appropriate csio_decode() format string looks like this: + * "{} *i3 {Len} i1 {Blocks} i4 {} *b6 {Code} b2 {Blocklen} i3" + * + * If the capacity_list_length is greater than + * sizeof(struct format_capacity_descriptor), then there are + * additional format capacity descriptors available which + * denote which format(s) the drive can handle. + * + * (Source: USB Mass Storage UFI Specification) + */ + +struct format_capacity_list_header { + uint8_t unused[3]; + uint8_t capacity_list_length; +}; + +struct format_capacity_descriptor { + uint8_t nblocks[4]; /* total number of LBAs */ + uint8_t byte4; /* only present in max/cur descriptor */ +#define FCD_CODE_MASK 0x03 /* mask for code field above */ +#define FCD_UNFORMATTED 0x01 /* unformatted media present, + * maximum capacity returned */ +#define FCD_FORMATTED 0x02 /* formatted media present, + * current capacity returned */ +#define FCD_NOMEDIA 0x03 /* no media present, + * maximum device capacity returned */ + uint8_t block_length[3]; /* length of an LBA in bytes */ +}; + struct scsi_reassign_blocks_data { u_int8_t reserved[2]; ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.24 2004/10/05 18:51:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.25 2004/10/11 22:04:15 peter Exp $"); #include "opt_compat.h" @@ -1203,25 +1203,21 @@ if (uap->namelen > CTL_MAXNAME || uap->namelen < 2) return (EINVAL); - - error = copyin(uap->name, &name, uap->namelen * sizeof(int)); + error = copyin(uap->name, name, uap->namelen * sizeof(int)); if (error) return (error); - mtx_lock(&Giant); - if (uap->oldlenp) oldlen = fuword32(uap->oldlenp); else oldlen = 0; error = userland_sysctl(td, name, uap->namelen, uap->old, &oldlen, 1, - uap->new, uap->newlen, &j); + uap->new, uap->newlen, &j, SCTL_MASK32); if (error && error != ENOMEM) goto done2; - if (uap->oldlenp) { + if (uap->oldlenp) suword32(uap->oldlenp, j); - } done2: mtx_unlock(&Giant); return (error); ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#6 (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.28 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.29 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#6 (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.28 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.29 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#6 (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.19 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.20 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#6 (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.29 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.30 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #include "opt_compat.h" @@ -456,7 +456,7 @@ { 0, (sy_call_t *)nosys }, /* 428 = __acl_aclcheck_link */ { 0, (sy_call_t *)nosys }, /* 429 = sigwait */ { SYF_MPSAFE | AS(thr_create_args), (sy_call_t *)thr_create }, /* 430 = thr_create */ - { SYF_MPSAFE | 0, (sy_call_t *)thr_exit }, /* 431 = thr_exit */ + { SYF_MPSAFE | AS(thr_exit_args), (sy_call_t *)thr_exit }, /* 431 = thr_exit */ { SYF_MPSAFE | AS(thr_self_args), (sy_call_t *)thr_self }, /* 432 = thr_self */ { SYF_MPSAFE | AS(thr_kill_args), (sy_call_t *)thr_kill }, /* 433 = thr_kill */ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ ==== //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -596,7 +596,7 @@ ; XXX implement 429 UNIMPL sigwait 430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } -431 MNOPROTO { void thr_exit(void); } +431 MNOPROTO { void thr_exit(long *state); } 432 MNOPROTO { int thr_self(long *id); } 433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } ==== //depot/projects/nsched/sys/compat/linux/linux_util.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410210451.i9L4pwY7014779>