PERFORCE change 148278 for review
Julian Elischer
julian at FreeBSD.org
Sun Aug 24 20:21:00 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=148278
Change 148278 by julian at julian_trafmon1 on 2008/08/24 20:20:45
IFC
Affected files ...
.. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#11 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#20 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pci_cfgreg.h#3 integrate
.. //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/vimage/src/sys/arm/include/endian.h#3 integrate
.. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#5 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#6 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#11 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#9 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#30 integrate
.. //depot/projects/vimage/src/sys/conf/files#36 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#18 integrate
.. //depot/projects/vimage/src/sys/conf/files.sparc64#10 integrate
.. //depot/projects/vimage/src/sys/conf/options#29 integrate
.. //depot/projects/vimage/src/sys/conf/options.sparc64#2 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/bfe/if_bfe.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/bfe/if_bfereg.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/dcons/dcons.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/drm/ati_pcigart.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm-subprocess.pl#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_agpsupport.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_auth.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_context.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_dma.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_drawable.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_fops.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_internal.h#1 branch
.. //depot/projects/vimage/src/sys/dev/drm/drm_ioctl.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_lock.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_memory.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_sarea.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_vm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_drm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_drv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_irq.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_mem.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_suspend.c#1 branch
.. //depot/projects/vimage/src/sys/dev/drm/mach64_dma.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mach64_drm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mach64_irq.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mach64_state.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_dma.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_drm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_drv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_irq.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_state.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_warp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r128_cce.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r128_drm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r128_drv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r128_irq.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r128_state.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r300_reg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_drm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_mem.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_microcode.h#1 branch
.. //depot/projects/vimage/src/sys/dev/drm/radeon_state.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/savage_bci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/savage_drm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/savage_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/savage_drv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/savage_state.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/sis_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/sis_drv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/sis_mm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/tdfx_drv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ex/if_ex.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ex/if_ex_isa.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ex/if_exvar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/mii/mii.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mii/mlphy.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/mii/tlphy.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/nmdm/nmdm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/ofw_console.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ppc/ppc.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ppc/ppc_acpi.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ppc/ppc_isa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ppc/ppcreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/sis/if_sis.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/csa.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/schistory.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/scmouse.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/scterm-sc.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/scvesactl.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/scvidctl.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/sysmouse.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_core.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ucom.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ucomvar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uftdi.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/umass.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/umodem.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#27 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uvisor.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/xen/console/console.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#16 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#22 integrate
.. //depot/projects/vimage/src/sys/i386/conf/NOTES#22 integrate
.. //depot/projects/vimage/src/sys/i386/conf/XBOX#7 integrate
.. //depot/projects/vimage/src/sys/i386/conf/XEN#2 integrate
.. //depot/projects/vimage/src/sys/i386/cpufreq/est.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#10 integrate
.. //depot/projects/vimage/src/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#9 integrate
.. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/include/cpufunc.h#6 integrate
.. //depot/projects/vimage/src/sys/i386/include/pci_cfgreg.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/isa/dpms.c#1 branch
.. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/xen/pmap.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#10 integrate
.. //depot/projects/vimage/src/sys/ia64/conf/SKI#3 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/ssc.c#2 integrate
.. //depot/projects/vimage/src/sys/isa/isa_common.c#3 integrate
.. //depot/projects/vimage/src/sys/isa/isavar.h#2 integrate
.. //depot/projects/vimage/src/sys/kern/init_main.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_acct.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_conf.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#22 integrate
.. //depot/projects/vimage/src/sys/kern/kern_intr.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/kern_lock.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/kern_resource.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/kern_synch.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/subr_prf.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.master#7 integrate
.. //depot/projects/vimage/src/sys/kern/systrace_args.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/tty_compat.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/tty_conf.c#2 delete
.. //depot/projects/vimage/src/sys/kern/tty_cons.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/tty_info.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/tty_inq.c#1 branch
.. //depot/projects/vimage/src/sys/kern/tty_outq.c#1 branch
.. //depot/projects/vimage/src/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/tty_pty.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/tty_ttydisc.c#1 branch
.. //depot/projects/vimage/src/sys/kern/vfs_cache.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#19 integrate
.. //depot/projects/vimage/src/sys/mips/mips/mp_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#26 integrate
.. //depot/projects/vimage/src/sys/modules/dpms/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/drm/i915/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/nmdm/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/rc/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/net/if.c#34 integrate
.. //depot/projects/vimage/src/sys/net/if_var.h#16 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_lro.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#36 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#14 edit
.. //depot/projects/vimage/src/sys/pc98/cbus/scterm-sck.c#2 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#14 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/NOTES#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#14 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#10 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#13 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#2 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#12 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#10 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#7 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_net.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#13 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_posix_shm.c#2 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_process.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#8 integrate
.. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#10 integrate
.. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate
.. //depot/projects/vimage/src/sys/security/mac_ifoff/mac_ifoff.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#10 integrate
.. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#12 integrate
.. //depot/projects/vimage/src/sys/security/mac_none/mac_none.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#8 integrate
.. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#12 integrate
.. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#12 integrate
.. //depot/projects/vimage/src/sys/sparc64/central/central.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#13 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/ebus/ebus.c#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/fhc/fhc.c#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/cpufunc.h#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci.h#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#12 integrate
.. //depot/projects/vimage/src/sys/sparc64/sbus/dma_sbus.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/sbus/sbus.c#8 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/exception.S#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/locore.S#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#13 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/hvcons.c#5 integrate
.. //depot/projects/vimage/src/sys/sys/conf.h#11 integrate
.. //depot/projects/vimage/src/sys/sys/copyright.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/file.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/kernel.h#14 integrate
.. //depot/projects/vimage/src/sys/sys/linedisc.h#2 delete
.. //depot/projects/vimage/src/sys/sys/param.h#25 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#21 integrate
.. //depot/projects/vimage/src/sys/sys/resource.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/resourcevar.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.mk#6 integrate
.. //depot/projects/vimage/src/sys/sys/sysproto.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/termios.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/tty.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/ttycom.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/ttydefaults.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/ttydevsw.h#1 branch
.. //depot/projects/vimage/src/sys/sys/ttydisc.h#1 branch
.. //depot/projects/vimage/src/sys/sys/ttyqueue.h#1 branch
.. //depot/projects/vimage/src/sys/sys/user.h#8 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#8 integrate
.. //depot/projects/vimage/src/sys/vm/uma_core.c#9 integrate
.. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_client.c#2 integrate
.. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#3 integrate
.. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#3 integrate
Differences ...
==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#11 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
@@ -77,10 +77,6 @@
CTASSERT(APIC_LOCAL_INTS == 240);
CTASSERT(IPI_STOP < APIC_SPURIOUS_INT);
-#define LAPIC_TIMER_HZ_DIVIDER 2
-#define LAPIC_TIMER_STATHZ_DIVIDER 15
-#define LAPIC_TIMER_PROFHZ_DIVIDER 3
-
/* Magic IRQ values for the timer and syscalls. */
#define IRQ_TIMER (NUM_IO_INTS + 1)
#define IRQ_SYSCALL (NUM_IO_INTS + 2)
@@ -389,13 +385,24 @@
lapic_timer_divisor, value);
/*
- * We will drive the timer at a small multiple of hz and drive
- * both of the other timers with similarly small but relatively
- * prime divisors.
+ * We want to run stathz in the neighborhood of 128hz. We would
+ * like profhz to run as often as possible, so we let it run on
+ * each clock tick. We try to honor the requested 'hz' value as
+ * much as possible.
+ *
+ * If 'hz' is above 1500, then we just let the lapic timer
+ * (and profhz) run at hz. If 'hz' is below 1500 but above
+ * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz'
+ * is below 750 then we let the lapic timer run at 4 * 'hz'.
*/
- lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER;
- stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER;
- profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER;
+ if (hz >= 1500)
+ lapic_timer_hz = hz;
+ else if (hz >= 750)
+ lapic_timer_hz = hz * 2;
+ else
+ lapic_timer_hz = hz * 4;
+ stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+ profhz = lapic_timer_hz;
lapic_timer_period = value / lapic_timer_hz;
/*
==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#20 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.506 2008/08/03 10:32:17 ed Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $
cpu HAMMER
ident GENERIC
@@ -257,7 +257,7 @@
device random # Entropy device
device ether # Ethernet support
device tun # Packet tunnel.
-device pty # Pseudo-ttys (telnet etc)
+device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
device gif # IPv6 and IPv4 tunneling
device faith # IPv6-to-IPv4 relaying (translation)
==== //depot/projects/vimage/src/sys/amd64/include/pci_cfgreg.h#3 (text+ko) ====
@@ -23,7 +23,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/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $
*
*/
@@ -37,6 +37,7 @@
#define CONF1_ENABLE_MSK1 0x80000001ul
#define CONF1_ENABLE_RES1 0x80000000ul
+int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus);
int pci_cfgregopen(void);
u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes);
void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes);
==== //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,11 +36,26 @@
#include <sys/mutex.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
#include <machine/pci_cfgreg.h>
+enum {
+ CFGMECH_NONE = 0,
+ CFGMECH_1,
+ CFGMECH_PCIE,
+};
+
+static int pciereg_cfgread(int bus, unsigned slot, unsigned func,
+ unsigned reg, unsigned bytes);
+static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func,
+ unsigned reg, int data, unsigned bytes);
static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes);
static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes);
+static int cfgmech;
+static vm_offset_t pcie_base;
+static int pcie_minbus, pcie_maxbus;
static struct mtx pcicfg_mtx;
/*
@@ -49,12 +64,42 @@
int
pci_cfgregopen(void)
{
- static int opened = 0;
+ uint64_t pciebar;
+ uint16_t did, vid;
- if (opened)
+ if (cfgmech != CFGMECH_NONE)
return (1);
mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN);
- opened = 1;
+ cfgmech = CFGMECH_1;
+
+ /*
+ * Grope around in the PCI config space to see if this is a
+ * chipset that is capable of doing memory-mapped config cycles.
+ * This also implies that it can do PCIe extended config cycles.
+ */
+
+ /* Check for supported chipsets */
+ vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2);
+ did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2);
+ switch (vid) {
+ case 0x8086:
+ switch (did) {
+ case 0x3590:
+ case 0x3592:
+ /* Intel 7520 or 7320 */
+ pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16;
+ pcie_cfgregopen(pciebar, 0, 255);
+ break;
+ case 0x2580:
+ case 0x2584:
+ case 0x2590:
+ /* Intel 915, 925, or 915GM */
+ pciebar = pci_cfgregread(0, 0, 0, 0x48, 4);
+ pcie_cfgregopen(pciebar, 0, 255);
+ break;
+ }
+ }
+
return (1);
}
@@ -130,6 +175,11 @@
int data = -1;
int port;
+ if (cfgmech == CFGMECH_PCIE) {
+ data = pciereg_cfgread(bus, slot, func, reg, bytes);
+ return (data);
+ }
+
mtx_lock_spin(&pcicfg_mtx);
port = pci_cfgenable(bus, slot, func, reg, bytes);
if (port != 0) {
@@ -155,6 +205,11 @@
{
int port;
+ if (cfgmech == CFGMECH_PCIE) {
+ pciereg_cfgwrite(bus, slot, func, reg, data, bytes);
+ return;
+ }
+
mtx_lock_spin(&pcicfg_mtx);
port = pci_cfgenable(bus, slot, func, reg, bytes);
if (port != 0) {
@@ -173,3 +228,82 @@
}
mtx_unlock_spin(&pcicfg_mtx);
}
+
+int
+pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus)
+{
+
+ if (minbus != 0)
+ return (0);
+
+ if (bootverbose)
+ printf("PCIe: Memory Mapped configuration base @ 0x%lx\n",
+ base);
+
+ /* XXX: We should make sure this really fits into the direct map. */
+ pcie_base = (vm_offset_t)pmap_mapdev(base, (maxbus + 1) << 20);
+ pcie_minbus = minbus;
+ pcie_maxbus = maxbus;
+ cfgmech = CFGMECH_PCIE;
+ return (1);
+}
+
+#define PCIE_VADDR(base, reg, bus, slot, func) \
+ ((base) + \
+ ((((bus) & 0xff) << 20) | \
+ (((slot) & 0x1f) << 15) | \
+ (((func) & 0x7) << 12) | \
+ ((reg) & 0xfff)))
+
+static int
+pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg,
+ unsigned bytes)
+{
+ volatile vm_offset_t va;
+ int data = -1;
+
+ if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 ||
+ func > PCI_FUNCMAX || reg >= 0x1000)
+ return (-1);
+
+ va = PCIE_VADDR(pcie_base, reg, bus, slot, func);
+
+ switch (bytes) {
+ case 4:
+ data = *(volatile uint32_t *)(va);
+ break;
+ case 2:
+ data = *(volatile uint16_t *)(va);
+ break;
+ case 1:
+ data = *(volatile uint8_t *)(va);
+ break;
+ }
+
+ return (data);
+}
+
+static void
+pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data,
+ unsigned bytes)
+{
+ volatile vm_offset_t va;
+
+ if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 ||
+ func > PCI_FUNCMAX || reg >= 0x1000)
+ return;
+
+ va = PCIE_VADDR(pcie_base, reg, bus, slot, func);
+
+ switch (bytes) {
+ case 4:
+ *(volatile uint32_t *)(va) = data;
+ break;
+ case 2:
+ *(volatile uint16_t *)(va) = data;
+ break;
+ case 1:
+ *(volatile uint8_t *)(va) = data;
+ break;
+ }
+}
==== //depot/projects/vimage/src/sys/arm/include/endian.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
*
* @(#)endian.h 8.1 (Berkeley) 6/10/93
* $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.12 2008/08/23 23:35:08 imp Exp $
*/
#ifndef _ENDIAN_H_
@@ -94,7 +94,7 @@
: "+r" (v), "=r" (t1));
return (v);
- }
+}
static __inline __uint16_t
__bswap16_var(__uint16_t v)
==== //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#5 (text+ko) ====
@@ -8,7 +8,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.33 2008/08/07 22:46:25 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $");
+
/*
* FreeBSD/sparc64 kernel loader - machine dependent part
*
@@ -28,7 +29,6 @@
#include <vm/vm.h>
#include <machine/asi.h>
-#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/elf.h>
#include <machine/lsu.h>
@@ -438,7 +438,7 @@
while (len) {
if (dtlb_va_to_pa_sun4u(va) == (vm_offset_t)-1 ||
itlb_va_to_pa_sun4u(va) == (vm_offset_t)-1) {
- /* Allocate a physical page, claim the virtual area */
+ /* Allocate a physical page, claim the virtual area. */
if (pa == (vm_offset_t)-1) {
pa = alloc_phys(PAGE_SIZE_4M, PAGE_SIZE_4M);
if (pa == (vm_offset_t)-1)
@@ -448,7 +448,9 @@
panic("%s: can't claim virtual page "
"(wanted %#lx, got %#lx)",
__func__, va, mva);
- /* The mappings may have changed, be paranoid. */
+ /*
+ * The mappings may have changed, be paranoid.
+ */
continue;
}
/*
@@ -553,6 +555,7 @@
}
if (cpu != bootcpu)
panic("%s: no node for bootcpu?!?!", __func__);
+
if (OF_getprop(child, "#dtlb-entries", &dtlb_slot_max,
sizeof(dtlb_slot_max)) == -1 ||
OF_getprop(child, "#itlb-entries", &itlb_slot_max,
@@ -580,7 +583,7 @@
struct devsw **dp;
/*
- * Tell the Open Firmware functions where they find the ofw gate.
+ * Tell the Open Firmware functions where they find the OFW gate.
*/
OF_init(openfirm);
==== //depot/projects/vimage/src/sys/bsm/audit_kevents.h#6 (text) ====
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34
- * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.14 2008/08/20 08:31:58 ed Exp $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -548,6 +548,7 @@
#define AUE_MKNODAT 43150 /* FreeBSD. */
#define AUE_READLINKAT 43151 /* FreeBSD. */
#define AUE_SYMLINKAT 43152 /* FreeBSD. */
+#define AUE_POSIXOPENPT 43153 /* FreeBSD. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 (text+ko) ====
@@ -382,6 +382,49 @@
#define _DONT_USE_1275_GENERIC_NAMES
#define _HAVE_CPUID_INSN
+#elif defined(__mips__)
+
+/*
+ * Define the appropriate "processor characteristics"
+ */
+#define _STACK_GROWS_DOWNWARD
+#define _LONG_LONG_LTOH
+#define _BIT_FIELDS_LTOH
+#define _IEEE_754
+#define _CHAR_IS_SIGNED
+#define _BOOL_ALIGNMENT 1
+#define _CHAR_ALIGNMENT 1
+#define _SHORT_ALIGNMENT 2
+#define _INT_ALIGNMENT 4
+#define _FLOAT_ALIGNMENT 4
+#define _FLOAT_COMPLEX_ALIGNMENT 4
+#define _LONG_ALIGNMENT 4
+#define _LONG_LONG_ALIGNMENT 4
+#define _DOUBLE_ALIGNMENT 4
+#define _DOUBLE_COMPLEX_ALIGNMENT 4
+#define _LONG_DOUBLE_ALIGNMENT 4
+#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 4
+#define _POINTER_ALIGNMENT 4
+#define _MAX_ALIGNMENT 4
+#define _ALIGNMENT_REQUIRED 0
+
+#define _LONG_LONG_ALIGNMENT_32 _LONG_LONG_ALIGNMENT
+
+/*
+ * Define the appropriate "implementation choices".
+ */
+#define _ILP32
+#if !defined(_I32LPx) && defined(_KERNEL)
+#define _I32LPx
+#endif
+#define _SUNOS_VTOC_16
+#define _DMA_USES_PHYSADDR
+#define _FIRMWARE_NEEDS_FDISK
+#define _PSM_MODULES
+#define _RTC_CONFIG
+#define _DONT_USE_1275_GENERIC_NAMES
+#define _HAVE_CPUID_INSN
+
#elif defined(__powerpc__)
/*
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#9 (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.87 2008/07/10 17:46:58 brooks Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.88 2008/08/20 08:39:10 ed Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
*/
#ifndef _FREEBSD32_SYSPROTO_H_
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#9 (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.85 2008/07/10 17:46:58 brooks Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.87 2008/08/20 08:39:10 ed Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
*/
#define FREEBSD32_SYS_syscall 0
@@ -355,4 +355,5 @@
#define FREEBSD32_SYS_renameat 501
#define FREEBSD32_SYS_symlinkat 502
#define FREEBSD32_SYS_unlinkat 503
-#define FREEBSD32_SYS_MAXSYSCALL 504
+#define FREEBSD32_SYS_posix_openpt 504
+#define FREEBSD32_SYS_MAXSYSCALL 505
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 (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.76 2008/07/10 17:46:58 brooks Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.78 2008/08/20 08:39:10 ed Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
*/
const char *freebsd32_syscallnames[] = {
@@ -511,4 +511,5 @@
"renameat", /* 501 = renameat */
"symlinkat", /* 502 = symlinkat */
"unlinkat", /* 503 = unlinkat */
+ "posix_openpt", /* 504 = posix_openpt */
};
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#9 (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.86 2008/07/10 17:46:58 brooks Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.88 2008/08/20 08:39:10 ed Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
*/
#include "opt_compat.h"
@@ -542,4 +542,5 @@
{ AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */
{ AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */
{ AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */
+ { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */
};
==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#10 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.101 2008/07/10 17:45:57 brooks Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -31,6 +31,13 @@
; NOSTD implemented but as a lkm that can be statically
; compiled in; sysent entry will be filled with lkmsys
; so the SYSCALL_MODULE macro works
+; NOARGS same as STD except do not create structure in sys/sysproto.h
+; NODEF same as STD except only have the entry in the syscall table
+; added. Meaning - do do not create structure or function
+; prototype in sys/sysproto.h
+; NOPROTO same as STD except do not create structure or
+; function prototype in sys/sysproto.h. Does add a
+; definition to syscall.h besides adding a sysent.
; #ifdef's, etc. may be included, and are copied to the output files.
@@ -846,3 +853,4 @@
char *path2); }
503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \
int flag); }
+504 AUE_POSIXOPENPT NOPROTO { int posix_openpt(int flags); }
==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#11 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $");
#include "opt_compat.h"
@@ -297,6 +297,11 @@
unsigned short ws_xpixel, ws_ypixel;
};
+struct speedtab {
+ int sp_speed; /* Speed. */
+ int sp_code; /* Code. */
+};
+
static struct speedtab sptab[] = {
{ B0, LINUX_B0 }, { B50, LINUX_B50 },
{ B75, LINUX_B75 }, { B110, LINUX_B110 },
@@ -396,7 +401,7 @@
lios->c_oflag |= LINUX_OPOST;
if (bios->c_oflag & ONLCR)
lios->c_oflag |= LINUX_ONLCR;
- if (bios->c_oflag & OXTABS)
+ if (bios->c_oflag & TAB3)
lios->c_oflag |= LINUX_XTABS;
lios->c_cflag = bsd_to_linux_speed(bios->c_ispeed, sptab);
@@ -538,7 +543,7 @@
if (lios->c_oflag & LINUX_ONLCR)
bios->c_oflag |= ONLCR;
if (lios->c_oflag & LINUX_XTABS)
- bios->c_oflag |= OXTABS;
+ bios->c_oflag |= TAB3;
bios->c_cflag = (lios->c_cflag & LINUX_CSIZE) << 4;
if (lios->c_cflag & LINUX_CSTOPB)
==== //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.92 2008/06/02 08:40:06 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -44,6 +44,7 @@
#include <sys/stat.h>
#include <sys/syscallsubr.h>
#include <sys/systm.h>
+#include <sys/tty.h>
#include <sys/vnode.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
@@ -109,8 +110,17 @@
if (fp->f_vnode != NULL &&
fp->f_vnode->v_un.vu_cdev != NULL &&
linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name,
- &major, &minor) == 0)
+ &major, &minor) == 0) {
buf->st_rdev = (major << 8 | minor);
+ } else if (fp->f_type == DTYPE_PTS) {
+ struct tty *tp = fp->f_data;
+
+ /* Convert the numbers for the slave device. */
+ if (linux_driver_get_major_minor(tp->t_dev->si_name,
+ &major, &minor) == 0) {
+ buf->st_rdev = (major << 8 | minor);
+ }
+ }
fdrop(fp, td);
}
==== //depot/projects/vimage/src/sys/conf/NOTES#30 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1503 2008/08/03 10:32:17 ed Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1275,11 +1275,7 @@
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
-# The `pty' device usually turns out to be ``effectively mandatory'',
-# as it is required for `telnetd', `rlogind', `screen', `emacs', and
-# `xterm', among others.
-
-device pty #Pseudo ttys
+device pty #BSD-style compatibility pseudo ttys
device nmdm #back-to-back tty devices
device md #Memory/malloc disk
device ccd #Concatenated disk driver
@@ -1291,9 +1287,6 @@
# Size of the kernel message buffer. Should be N * pagesize.
options MSGBUF_SIZE=40960
-# Maximum size of a tty or pty input buffer.
-options TTYHOG=8193
-
#####################################################################
# HARDWARE DEVICE CONFIGURATION
==== //depot/projects/vimage/src/sys/conf/files#36 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1332 2008/08/23 20:59:12 rnoland Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -572,6 +572,7 @@
dev/drm/i915_drv.c optional i915drm
dev/drm/i915_irq.c optional i915drm
dev/drm/i915_mem.c optional i915drm
+dev/drm/i915_suspend.c optional i915drm
dev/drm/mach64_dma.c optional mach64drm
dev/drm/mach64_drv.c optional mach64drm
dev/drm/mach64_irq.c optional mach64drm
@@ -1662,12 +1663,14 @@
kern/sysv_shm.c optional sysvshm
kern/tty.c standard
kern/tty_compat.c optional compat_43tty
-kern/tty_conf.c standard
kern/tty_cons.c standard
kern/tty_info.c standard
-kern/tty_pts.c optional pty
+kern/tty_inq.c standard
+kern/tty_outq.c standard
+kern/tty_pts.c standard
kern/tty_pty.c optional pty
kern/tty_tty.c standard
+kern/tty_ttydisc.c standard
kern/uipc_accf.c optional inet
kern/uipc_cow.c optional zero_copy_sockets
kern/uipc_debug.c optional ddb
@@ -2357,4 +2360,4 @@
dev/xen/console/console.c optional xen
dev/xen/console/xencons_ring.c optional xen
dev/xen/blkfront/blkfront.c optional xen
-dev/xen/netfront/netfront.c optional xen+dev/xen/netfront/netfront.c optional xen
==== //depot/projects/vimage/src/sys/conf/files.i386#18 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.604 2008/08/17 23:44:09 kmacy Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.605 2008/08/23 21:00:40 jhb Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -329,6 +329,7 @@
#i386/isa/atpic_vector.s standard
i386/isa/clock.c optional native
i386/xen/clock.c optional xen
+i386/isa/dpms.c optional dpms
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list