PERFORCE change 122928 for review

Roman Divacky rdivacky at FreeBSD.org
Thu Jul 5 09:34:14 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=122928

Change 122928 by rdivacky at rdivacky_witten on 2007/07/05 09:33:49

	IFC

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_at/sys/Makefile#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_machdep.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#18 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.amd64#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.arm#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.i386#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.ia64#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.pc98#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.powerpc#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.sparc64#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.sun4v#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options.amd64#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options.i386#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options.pc98#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/altq/altq/altq_cbq.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/altq/altq/altq_priq.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/altq/altq/altq_red.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/if_pflog.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/if_pflog.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/if_pfsync.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_mtag.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_ruleset.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_subr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/crypto/via/padlock.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_library.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/if_nxge.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/if_nxge.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/build-version.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/version.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xge-debug.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xge-defs.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xge-list.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xge-os-pal.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xge-os-template.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xge-queue.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-channel.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-config.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-device.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-driver.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-event.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-fifo.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-mgmt.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-mgmtaux.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-mm.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-regs.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-ring.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-stats.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal-types.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/include/xgehal.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xge-osdep.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xge-queue.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-channel-fp.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-channel.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-config.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-device-fp.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-device.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-driver.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-fifo.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-mgmt.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-mm.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-ring-fp.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-ring.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgehal/xgehal-stats.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/xgell-version.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ral/rt2560.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sbni/if_sbni.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/ac97_patch.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/dsp.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_axe.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_axereg.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_cdce.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ural.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uark.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ubser.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ugen.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhub.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umass.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umodem.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ums.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_port.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_quirks.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_quirks.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_subr.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdi.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdi.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uvisor.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uvscom.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_fifoops.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_uma.c#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_uma.h#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/pc/vesa.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ing.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ipr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_isppp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#9 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_conf.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_priv.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_smp.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_unit.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_generic.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#9 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#9 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#9 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/tty.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/tty_pts.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/tty_pty.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/tty_tty.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#44 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/Makefile#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/ipfw/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/nxge/Makefile#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/pf/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/tmpfs/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_ppp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net/pfkeyv2.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_radiotap.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netatalk/aarp.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netatalk/ddp.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_pcb.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_proto.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/raw_ip.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_output.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah6.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah_aesxcbcmac.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah_aesxcbcmac.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah_core.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah_input.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah_output.c#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp6.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_aesctr.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_aesctr.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_camellia.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_camellia.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_core.c#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_input.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_output.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_rijndael.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_rijndael.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/icmp6.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_proto.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_ipsec.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_ipsec.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipcomp.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipcomp6.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipcomp_core.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipcomp_input.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipcomp_output.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipsec.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipsec.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ipsec6.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6_nbr.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/raw_ip6.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_usrreq.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_output.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec6.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/key.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/key_debug.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/keysock.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/key.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/key.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/key_debug.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/key_debug.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/key_var.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/keydb.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/keydb.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/keysock.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netkey/keysock.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/cast.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_arg.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_bsm_token.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_syscalls.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_policy.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/conf.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mbuf.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/param.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#9 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#9 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#9 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/systm.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/dir.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_mmap.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageout.c#6 integrate

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_at/sys/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $
+# $FreeBSD: src/sys/Makefile,v 1.43 2007/07/01 11:38:26 gnn Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@
 # Directories to include in cscope name file and TAGS.
 CSCOPEDIRS=	bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
 		i4b isa kern libkern modules net net80211 netatalk netatm \
-		netgraph netinet netinet6 netipx netkey netnatm netncp \
+		netgraph netinet netinet6 netipx netnatm netncp \
 		netsmb nfs nfsclient nfs4client rpc pccard pci security sys \
 		ufs vm ${ARCHDIR}
 

==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#4 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.588 2007/06/17 04:27:45 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -210,7 +210,8 @@
     vm_page_t m, vm_prot_t prot, vm_page_t mpte);
 static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq,
 		vm_offset_t sva, pd_entry_t ptepde, vm_page_t *free);
-static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde);
+static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde,
+    vm_page_t *free);
 static void pmap_remove_entry(struct pmap *pmap, vm_page_t m,
 		vm_offset_t va);
 static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m);
@@ -1895,10 +1896,9 @@
  * Remove a single page from a process address space
  */
 static void
-pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde)
+pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, vm_page_t *free)
 {
 	pt_entry_t *pte;
-	vm_page_t free = NULL;
 
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	if ((*pde & PG_V) == 0)
@@ -1906,9 +1906,8 @@
 	pte = pmap_pde_to_pte(pde, va);
 	if ((*pte & PG_V) == 0)
 		return;
-	pmap_remove_pte(pmap, pte, va, *pde, &free);
+	pmap_remove_pte(pmap, pte, va, *pde, free);
 	pmap_invalidate_page(pmap, va);
-	pmap_free_zero_pages(free);
 }
 
 /*
@@ -1947,7 +1946,7 @@
 	if (sva + PAGE_SIZE == eva) {
 		pde = pmap_pde(pmap, sva);
 		if (pde && (*pde & PG_PS) == 0) {
-			pmap_remove_page(pmap, sva, pde);
+			pmap_remove_page(pmap, sva, pde, &free);
 			goto out;
 		}
 	}
@@ -2018,12 +2017,11 @@
 		}
 	}
 out:
-	if (anyvalid) {
+	if (anyvalid)
 		pmap_invalidate_all(pmap);
-		pmap_free_zero_pages(free);
-	}
 	vm_page_unlock_queues();	
 	PMAP_UNLOCK(pmap);
+	pmap_free_zero_pages(free);
 }
 
 /*
@@ -3003,9 +3001,9 @@
 		}
 	}
 	pmap_invalidate_all(pmap);
-	pmap_free_zero_pages(free);
 	vm_page_unlock_queues();
 	PMAP_UNLOCK(pmap);
+	pmap_free_zero_pages(free);
 }
 
 /*

==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#5 (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.482 2007/06/14 17:14:25 delphij Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.483 2007/07/01 21:47:45 njl Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -75,6 +75,9 @@
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
 
+# CPU frequency control
+device		cpufreq
+
 # Bus support.
 device		acpi
 device		pci

==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/NOTES#3 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.65 2007/05/09 15:55:45 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.68 2007/07/04 00:18:38 bz Exp $
 #
 
 #
@@ -542,9 +542,9 @@
 #XXX#device	i4bipr
 #XXX#options 	NI4BIPR=4
 # enable VJ header compression detection for ipr i/f
-options 	IPR_VJ
+#XXX#options 	IPR_VJ
 # enable logging of the first n IP packets to isdnd (n=32 here)
-options 	IPR_LOG=32
+#XXX#options 	IPR_LOG=32
 #
 # network driver for sync PPP over ISDN; requires an equivalent
 # number of sppp device to be configured

==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_machdep.c#4 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.44 2007/06/05 00:00:50 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.45 2007/07/04 23:06:43 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -927,7 +927,6 @@
 		bsd_args.len  = linux_args->len;
 	}
 	bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE;
-	bsd_args.pad = 0;
 
 #ifdef DEBUG
 	if (ldebug(mmap))
@@ -1153,7 +1152,6 @@
 #endif
 
 	sa.fd = args->fd;
-	sa.pad = 0;
 	sa.length = args->length;
 	return ftruncate(td, &sa);
 }

==== //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt.c#5 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.189 2007/06/17 05:55:53 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.190 2007/06/30 14:58:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -620,6 +620,18 @@
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
+		/*
+		 * Western Digital My Book 250GB (USB)
+		 * hangs upon serial number probing.
+		 * PR: 107495
+		 */
+		{
+			T_DIRECT, SIP_MEDIA_FIXED, "WD",
+			"2500JB External", "*"
+		},
+		CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0
+	},
+	{
 		/* Default tagged queuing parameters for all devices */
 		{
 		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,

==== //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.215 2007/06/16 18:22:19 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224 2007/07/01 17:42:07 imp Exp $");
 
 #include <sys/param.h>
 
@@ -457,6 +457,14 @@
 	},
 	{
 		/*
+		 * iRiver U10 MP3 player
+		 * PR: usb/92306
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "iriver", "U10*",
+		"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
 		 * X-Micro Flash Disk
 		 * PR: usb/96901
 		 */
@@ -471,6 +479,62 @@
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "EM732X", "MP3 Player*",
 		"1.0"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
 	},
+	{
+		/*
+		 * Denver MP3 player
+		 * PR: usb/107101
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "DENVER", "MP3 PLAYER",
+		 "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
+		 * Philips USB Key Audio KEY013
+		 * PR: usb/68412
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "PHILIPS", "Key*", "*"},
+		/*quirks*/ DA_Q_NO_SYNC_CACHE | DA_Q_NO_PREVENT
+	},
+	{
+		/*
+		 * JNC MP3 Player
+		 * PR: usb/94439
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "JNC*" , "MP3 Player*",
+		 "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
+		 * SAMSUNG MP0402H
+		 * PR: usb/108427
+		 */
+		{T_DIRECT, SIP_MEDIA_FIXED, "SAMSUNG", "MP0402H", "*"},
+		/*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
+		 * I/O Magic USB flash - Giga Bank
+		 * PR: usb/108810
+		 */
+		{T_DIRECT, SIP_MEDIA_FIXED, "GS-Magic", "stor*", "*"},
+		/*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
+		 * JoyFly 128mb USB Flash Drive
+		 * PR: 96133
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "USB 2.0", "Flash Disk*",
+		 "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
+		 * ChipsBnk usb stick
+		 * PR: 103702
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "ChipsBnk", "USB*",
+		 "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
 };
 
 static	disk_strategy_t	dastrategy;

==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_misc.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.65 2007/06/17 04:37:57 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.66 2007/07/04 23:04:41 peter Exp $");
 
 #include "opt_compat.h"
 
@@ -475,6 +475,24 @@
 	return (mmap(td, &ap));
 }
 
+#ifdef COMPAT_FREEBSD6
+int
+freebsd6_freebsd32_mmap(struct thread *td, struct freebsd6_freebsd32_mmap_args *uap)
+{
+	struct freebsd32_mmap_args ap;
+
+	ap.addr = uap->addr;
+	ap.len = uap->len;
+	ap.prot = uap->prot;
+	ap.flags = uap->flags;
+	ap.fd = uap->fd;
+	ap.poslo = uap->poslo;
+	ap.poshi = uap->poshi;
+
+	return (freebsd32_mmap(td, &ap));
+}
+#endif
+
 struct itimerval32 {
 	struct timeval32 it_interval;
 	struct timeval32 it_value;
@@ -1616,6 +1634,71 @@
 	return (ftruncate(td, &ap));
 }
 
+#ifdef COMPAT_FREEBSD6
+/* versions with the 'int pad' argument */
+int
+freebsd6_freebsd32_pread(struct thread *td, struct freebsd6_freebsd32_pread_args *uap)
+{
+	struct pread_args ap;
+
+	ap.fd = uap->fd;
+	ap.buf = uap->buf;
+	ap.nbyte = uap->nbyte;
+	ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32));
+	return (pread(td, &ap));
+}
+
+int
+freebsd6_freebsd32_pwrite(struct thread *td, struct freebsd6_freebsd32_pwrite_args *uap)
+{
+	struct pwrite_args ap;
+
+	ap.fd = uap->fd;
+	ap.buf = uap->buf;
+	ap.nbyte = uap->nbyte;
+	ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32));
+	return (pwrite(td, &ap));
+}
+
+int
+freebsd6_freebsd32_lseek(struct thread *td, struct freebsd6_freebsd32_lseek_args *uap)
+{
+	int error;
+	struct lseek_args ap;
+	off_t pos;
+
+	ap.fd = uap->fd;
+	ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32));
+	ap.whence = uap->whence;
+	error = lseek(td, &ap);
+	/* Expand the quad return into two parts for eax and edx */
+	pos = *(off_t *)(td->td_retval);
+	td->td_retval[0] = pos & 0xffffffff;	/* %eax */
+	td->td_retval[1] = pos >> 32;		/* %edx */
+	return error;
+}
+
+int
+freebsd6_freebsd32_truncate(struct thread *td, struct freebsd6_freebsd32_truncate_args *uap)
+{
+	struct truncate_args ap;
+
+	ap.path = uap->path;
+	ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32));
+	return (truncate(td, &ap));
+}
+
+int
+freebsd6_freebsd32_ftruncate(struct thread *td, struct freebsd6_freebsd32_ftruncate_args *uap)
+{
+	struct ftruncate_args ap;
+
+	ap.fd = uap->fd;
+	ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32));
+	return (ftruncate(td, &ap));
+}
+#endif /* COMPAT_FREEBSD6 */
+
 struct sf_hdtr32 {
 	uint32_t headers;
 	int hdr_cnt;

==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_proto.h#2 (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.76 2006/12/20 19:39:10 jkim Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.77 2007/07/04 23:03:50 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp 
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_
@@ -134,22 +134,6 @@
 	char a3_l_[PADL_(uint32_t)]; uint32_t a3; char a3_r_[PADR_(uint32_t)];
 	char a4_l_[PADL_(uint32_t)]; uint32_t a4; char a4_r_[PADR_(uint32_t)];
 };
-struct freebsd32_pread_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
-	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
-};
-struct freebsd32_pwrite_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
-	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
-};
 struct freebsd32_stat_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
@@ -162,35 +146,6 @@
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
 };
-struct freebsd32_mmap_args {
-	char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)];
-	char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)];
-};
-struct freebsd32_lseek_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
-	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
-	char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
-};
-struct freebsd32_truncate_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
-	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
-};
-struct freebsd32_ftruncate_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
-	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
-};
 struct freebsd32_sysctl_args {
 	char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
 	char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
@@ -322,6 +277,45 @@
 	char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)];
 	char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)];
 };
+struct freebsd32_pread_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
+	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_pwrite_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
+	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_mmap_args {
+	char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
+	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
+	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
+	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)];
+	char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_lseek_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+	char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
+};
+struct freebsd32_truncate_args {
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_ftruncate_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
 int	freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *);
 int	freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *);
 int	freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *);
@@ -341,15 +335,9 @@
 int	freebsd32_semsys(struct thread *, struct freebsd32_semsys_args *);
 int	freebsd32_msgsys(struct thread *, struct freebsd32_msgsys_args *);
 int	freebsd32_shmsys(struct thread *, struct freebsd32_shmsys_args *);
-int	freebsd32_pread(struct thread *, struct freebsd32_pread_args *);
-int	freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *);
 int	freebsd32_stat(struct thread *, struct freebsd32_stat_args *);
 int	freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *);
 int	freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *);
-int	freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *);
-int	freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *);
-int	freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *);
-int	freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *);
 int	freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *);
 int	freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *);
 int	freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *);
@@ -377,6 +365,12 @@
 int	freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *);
 int	freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *);
 int	freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *);
+int	freebsd32_pread(struct thread *, struct freebsd32_pread_args *);
+int	freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *);
+int	freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *);
+int	freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *);
+int	freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *);
+int	freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *);
 
 #ifdef COMPAT_43
 
@@ -466,6 +460,63 @@
 
 #endif /* COMPAT_FREEBSD4 */
 
+
+#ifdef COMPAT_FREEBSD6
+
+struct freebsd6_freebsd32_pread_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
+	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_pwrite_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
+	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_mmap_args {
+	char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
+	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
+	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
+	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+	char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)];
+	char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_lseek_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+	char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
+};
+struct freebsd6_freebsd32_truncate_args {
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_ftruncate_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
+int	freebsd6_freebsd32_pread(struct thread *, struct freebsd6_freebsd32_pread_args *);
+int	freebsd6_freebsd32_pwrite(struct thread *, struct freebsd6_freebsd32_pwrite_args *);
+int	freebsd6_freebsd32_mmap(struct thread *, struct freebsd6_freebsd32_mmap_args *);
+int	freebsd6_freebsd32_lseek(struct thread *, struct freebsd6_freebsd32_lseek_args *);
+int	freebsd6_freebsd32_truncate(struct thread *, struct freebsd6_freebsd32_truncate_args *);
+int	freebsd6_freebsd32_ftruncate(struct thread *, struct freebsd6_freebsd32_ftruncate_args *);
+
+#endif /* COMPAT_FREEBSD6 */
+
 #define	FREEBSD32_SYS_AUE_freebsd32_wait4	AUE_WAIT4
 #define	FREEBSD32_SYS_AUE_freebsd32_recvmsg	AUE_RECVMSG
 #define	FREEBSD32_SYS_AUE_freebsd32_sendmsg	AUE_SENDMSG
@@ -485,15 +536,9 @@
 #define	FREEBSD32_SYS_AUE_freebsd32_semsys	AUE_SEMSYS
 #define	FREEBSD32_SYS_AUE_freebsd32_msgsys	AUE_MSGSYS
 #define	FREEBSD32_SYS_AUE_freebsd32_shmsys	AUE_SHMSYS
-#define	FREEBSD32_SYS_AUE_freebsd32_pread	AUE_PREAD
-#define	FREEBSD32_SYS_AUE_freebsd32_pwrite	AUE_PWRITE
 #define	FREEBSD32_SYS_AUE_freebsd32_stat	AUE_STAT
 #define	FREEBSD32_SYS_AUE_freebsd32_fstat	AUE_FSTAT
 #define	FREEBSD32_SYS_AUE_freebsd32_lstat	AUE_LSTAT
-#define	FREEBSD32_SYS_AUE_freebsd32_mmap	AUE_MMAP
-#define	FREEBSD32_SYS_AUE_freebsd32_lseek	AUE_LSEEK
-#define	FREEBSD32_SYS_AUE_freebsd32_truncate	AUE_TRUNCATE
-#define	FREEBSD32_SYS_AUE_freebsd32_ftruncate	AUE_FTRUNCATE
 #define	FREEBSD32_SYS_AUE_freebsd32_sysctl	AUE_SYSCTL
 #define	FREEBSD32_SYS_AUE_freebsd32_futimes	AUE_FUTIMES
 #define	FREEBSD32_SYS_AUE_freebsd32_msgsnd	AUE_MSGSND
@@ -521,6 +566,12 @@
 #define	FREEBSD32_SYS_AUE_freebsd32_thr_suspend	AUE_NULL
 #define	FREEBSD32_SYS_AUE_freebsd32_umtx_op	AUE_NULL
 #define	FREEBSD32_SYS_AUE_freebsd32_thr_new	AUE_NULL
+#define	FREEBSD32_SYS_AUE_freebsd32_pread	AUE_PREAD
+#define	FREEBSD32_SYS_AUE_freebsd32_pwrite	AUE_PWRITE
+#define	FREEBSD32_SYS_AUE_freebsd32_mmap	AUE_MMAP
+#define	FREEBSD32_SYS_AUE_freebsd32_lseek	AUE_LSEEK
+#define	FREEBSD32_SYS_AUE_freebsd32_truncate	AUE_TRUNCATE
+#define	FREEBSD32_SYS_AUE_freebsd32_ftruncate	AUE_FTRUNCATE
 
 #undef PAD_
 #undef PADL_

==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscall.h#2 (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.74 2006/12/20 19:39:10 jkim Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.75 2007/07/04 23:03:50 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp 
  */
 
 #define	FREEBSD32_SYS_syscall	0
@@ -24,7 +24,7 @@
 #define	FREEBSD32_SYS_chmod	15
 #define	FREEBSD32_SYS_chown	16
 #define	FREEBSD32_SYS_break	17
-				/* 18 is old freebsd32_getfsstat */
+#define	FREEBSD32_SYS_freebsd4_freebsd32_getfsstat	18
 				/* 19 is obsolete olseek */
 #define	FREEBSD32_SYS_getpid	20
 #define	FREEBSD32_SYS_mount	21
@@ -153,8 +153,8 @@
 				/* 149 is obsolete oquota */
 				/* 150 is obsolete ogetsockname */
 				/* 156 is obsolete ogetdirentries */
-				/* 157 is old freebsd32_statfs */
-				/* 158 is old freebsd32_fstatfs */
+#define	FREEBSD32_SYS_freebsd4_freebsd32_statfs	157
+#define	FREEBSD32_SYS_freebsd4_freebsd32_fstatfs	158
 #define	FREEBSD32_SYS_getfh	161
 #define	FREEBSD32_SYS_getdomainname	162
 #define	FREEBSD32_SYS_setdomainname	163
@@ -164,8 +164,8 @@
 #define	FREEBSD32_SYS_freebsd32_semsys	169
 #define	FREEBSD32_SYS_freebsd32_msgsys	170
 #define	FREEBSD32_SYS_freebsd32_shmsys	171
-#define	FREEBSD32_SYS_freebsd32_pread	173
-#define	FREEBSD32_SYS_freebsd32_pwrite	174
+#define	FREEBSD32_SYS_freebsd6_freebsd32_pread	173
+#define	FREEBSD32_SYS_freebsd6_freebsd32_pwrite	174
 #define	FREEBSD32_SYS_ntp_adjtime	176
 #define	FREEBSD32_SYS_setgid	181
 #define	FREEBSD32_SYS_setegid	182
@@ -178,11 +178,11 @@
 #define	FREEBSD32_SYS_getrlimit	194
 #define	FREEBSD32_SYS_setrlimit	195
 #define	FREEBSD32_SYS_getdirentries	196
-#define	FREEBSD32_SYS_freebsd32_mmap	197
+#define	FREEBSD32_SYS_freebsd6_freebsd32_mmap	197
 #define	FREEBSD32_SYS___syscall	198
-#define	FREEBSD32_SYS_freebsd32_lseek	199
-#define	FREEBSD32_SYS_freebsd32_truncate	200
-#define	FREEBSD32_SYS_freebsd32_ftruncate	201
+#define	FREEBSD32_SYS_freebsd6_freebsd32_lseek	199
+#define	FREEBSD32_SYS_freebsd6_freebsd32_truncate	200
+#define	FREEBSD32_SYS_freebsd6_freebsd32_ftruncate	201
 #define	FREEBSD32_SYS_freebsd32_sysctl	202
 #define	FREEBSD32_SYS_mlock	203

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list