svn commit: r250910 - in user/attilio/vmobj-readlock/sys: amd64/amd64 amd64/include arm/arm arm/ti cam cam/ata cam/scsi compat/freebsd32 conf contrib/dev/acpica contrib/dev/acpica/common contrib/de...

Attilio Rao attilio at FreeBSD.org
Wed May 22 15:15:12 UTC 2013 

Author: attilio
Date: Wed May 22 15:15:05 2013
New Revision: 250910
URL: http://svnweb.freebsd.org/changeset/base/250910

Log:
  MFC

Added:
  user/attilio/vmobj-readlock/sys/amd64/include/fdt.h
     - copied unchanged from r250886, user/attilio/vmcontention/sys/amd64/include/fdt.h
  user/attilio/vmobj-readlock/sys/amd64/include/ofw_machdep.h
     - copied unchanged from r250886, user/attilio/vmcontention/sys/amd64/include/ofw_machdep.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asloptions.c
     - copied unchanged from r250886, user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asloptions.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/tables/tbprint.c
     - copied unchanged from r250886, user/attilio/vmcontention/sys/contrib/dev/acpica/components/tables/tbprint.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utbuffer.c
     - copied unchanged from r250886, user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/uterror.c
     - copied unchanged from r250886, user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/uterror.c
  user/attilio/vmobj-readlock/sys/dev/fdt/fdt_x86.c
     - copied unchanged from r250886, user/attilio/vmcontention/sys/dev/fdt/fdt_x86.c
  user/attilio/vmobj-readlock/sys/dev/uart/uart_cpu_fdt.c
     - copied unchanged from r250886, user/attilio/vmcontention/sys/dev/uart/uart_cpu_fdt.c
  user/attilio/vmobj-readlock/sys/i386/include/fdt.h
     - copied unchanged from r250886, user/attilio/vmcontention/sys/i386/include/fdt.h
  user/attilio/vmobj-readlock/sys/i386/include/ofw_machdep.h
     - copied unchanged from r250886, user/attilio/vmcontention/sys/i386/include/ofw_machdep.h
  user/attilio/vmobj-readlock/sys/x86/include/fdt.h
     - copied unchanged from r250886, user/attilio/vmcontention/sys/x86/include/fdt.h
  user/attilio/vmobj-readlock/sys/x86/include/ofw_machdep.h
     - copied unchanged from r250886, user/attilio/vmcontention/sys/x86/include/ofw_machdep.h
  user/attilio/vmobj-readlock/sys/x86/x86/fdt_machdep.c
     - copied unchanged from r250886, user/attilio/vmcontention/sys/x86/x86/fdt_machdep.c
Modified:
  user/attilio/vmobj-readlock/sys/amd64/amd64/db_trace.c
  user/attilio/vmobj-readlock/sys/amd64/amd64/machdep.c
  user/attilio/vmobj-readlock/sys/amd64/amd64/mp_machdep.c
  user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c
  user/attilio/vmobj-readlock/sys/amd64/include/md_var.h
  user/attilio/vmobj-readlock/sys/amd64/include/metadata.h
  user/attilio/vmobj-readlock/sys/amd64/include/pcpu.h
  user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c
  user/attilio/vmobj-readlock/sys/arm/arm/pmap.c
  user/attilio/vmobj-readlock/sys/arm/arm/stack_machdep.c
  user/attilio/vmobj-readlock/sys/arm/ti/ti_mmchs.c
  user/attilio/vmobj-readlock/sys/cam/ata/ata_da.c
  user/attilio/vmobj-readlock/sys/cam/cam_xpt.c
  user/attilio/vmobj-readlock/sys/cam/cam_xpt_periph.h
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_cd.c
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_ch.c
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_da.c
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_sa.c
  user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_misc.c
  user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_proto.h
  user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscall.h
  user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscalls.c
  user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_sysent.c
  user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/attilio/vmobj-readlock/sys/compat/freebsd32/syscalls.master
  user/attilio/vmobj-readlock/sys/conf/Makefile.amd64
  user/attilio/vmobj-readlock/sys/conf/Makefile.i386
  user/attilio/vmobj-readlock/sys/conf/files
  user/attilio/vmobj-readlock/sys/conf/files.amd64
  user/attilio/vmobj-readlock/sys/conf/files.arm
  user/attilio/vmobj-readlock/sys/conf/files.i386
  user/attilio/vmobj-readlock/sys/conf/files.mips
  user/attilio/vmobj-readlock/sys/conf/files.powerpc
  user/attilio/vmobj-readlock/sys/conf/kern.mk
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/acpica_prep.sh
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/adisasm.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/adwalk.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/dmextern.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/dmrestag.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/dmtable.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/dmtbdump.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/getopt.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslbtypes.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslcodegen.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslcompile.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslerror.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslfold.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslhex.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asllength.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asllisting.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asllistsup.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslload.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asllookup.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslmain.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslmessages.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslmethod.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslnamesp.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asloffset.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslopcodes.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asloperands.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslpredef.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslresource.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslstartup.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslsupport.l
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asltransform.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asltree.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/asltypes.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslutils.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslwalks.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/aslxref.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/dtexpress.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/dtfield.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/dtio.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/dtsubtable.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/dttable.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/dtutils.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/prscan.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbexec.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbinput.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbnames.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbstats.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbutils.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/dbxface.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmobject.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evglock.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evgpe.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evgpeblk.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evgpeinit.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evhandler.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evmisc.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evrgnini.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evxfgpe.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/evxfregn.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exconfig.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exconvrt.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/excreate.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exdebug.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exdump.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exfield.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exfldio.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exmisc.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exnames.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exoparg1.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exoparg2.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exoparg3.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exoparg6.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exprep.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exregion.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exresnte.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exresolv.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exresop.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exstore.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/exstoren.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/hardware/hwregs.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/hardware/hwxface.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsdump.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsinit.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nspredef.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsutils.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/parser/psargs.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/parser/psloop.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/parser/psobject.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/parser/psparse.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/parser/pstree.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/resources/rscalc.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/resources/rscreate.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/resources/rsdump.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/resources/rsmisc.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/resources/rsutils.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/resources/rsxface.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/tables/tbinstal.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/tables/tbutils.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/tables/tbxfload.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utcopy.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utdebug.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utdelete.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/uteval.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utexcep.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utids.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utmisc.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utobject.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utstring.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/uttrack.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/utxferror.c
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/acapps.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/acglobal.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/acpiosxf.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/acpixf.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/actypes.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/acutils.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/platform/acenv.h
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  user/attilio/vmobj-readlock/sys/dev/acpica/Osd/OsdTable.c
  user/attilio/vmobj-readlock/sys/dev/ahci/ahci.c
  user/attilio/vmobj-readlock/sys/dev/ath/ath_hal/ah.c
  user/attilio/vmobj-readlock/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_beacon.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_misc.h
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_sysctl.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tdma.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.h
  user/attilio/vmobj-readlock/sys/dev/ath/if_athvar.h
  user/attilio/vmobj-readlock/sys/dev/sound/pci/hda/hdaa_patches.c
  user/attilio/vmobj-readlock/sys/dev/uart/uart_bus_fdt.c
  user/attilio/vmobj-readlock/sys/dev/usb/quirk/usb_quirk.c
  user/attilio/vmobj-readlock/sys/dev/usb/usbdevs
  user/attilio/vmobj-readlock/sys/fs/nullfs/null_vfsops.c
  user/attilio/vmobj-readlock/sys/geom/geom_dump.c
  user/attilio/vmobj-readlock/sys/geom/raid/md_ddf.c
  user/attilio/vmobj-readlock/sys/i386/i386/machdep.c
  user/attilio/vmobj-readlock/sys/i386/i386/pmap.c
  user/attilio/vmobj-readlock/sys/i386/include/metadata.h
  user/attilio/vmobj-readlock/sys/i386/xen/pmap.c
  user/attilio/vmobj-readlock/sys/ia64/ia64/pmap.c
  user/attilio/vmobj-readlock/sys/kern/init_sysent.c
  user/attilio/vmobj-readlock/sys/kern/kern_jail.c
  user/attilio/vmobj-readlock/sys/kern/kern_priv.c
  user/attilio/vmobj-readlock/sys/kern/syscalls.c
  user/attilio/vmobj-readlock/sys/kern/syscalls.master
  user/attilio/vmobj-readlock/sys/kern/systrace_args.c
  user/attilio/vmobj-readlock/sys/kern/vfs_bio.c
  user/attilio/vmobj-readlock/sys/mips/mips/pmap.c
  user/attilio/vmobj-readlock/sys/modules/acpi/acpi/Makefile
  user/attilio/vmobj-readlock/sys/netinet/sctp_os_bsd.h
  user/attilio/vmobj-readlock/sys/netinet6/in6.c
  user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea.c
  user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea64.c
  user/attilio/vmobj-readlock/sys/powerpc/booke/pmap.c
  user/attilio/vmobj-readlock/sys/powerpc/include/gdb_machdep.h
  user/attilio/vmobj-readlock/sys/powerpc/wii/wii_gpio.c
  user/attilio/vmobj-readlock/sys/powerpc/wii/wii_gpioreg.h
  user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c
  user/attilio/vmobj-readlock/sys/sys/_types.h
  user/attilio/vmobj-readlock/sys/sys/cdefs.h
  user/attilio/vmobj-readlock/sys/sys/mbuf.h
  user/attilio/vmobj-readlock/sys/sys/param.h
  user/attilio/vmobj-readlock/sys/sys/sdt.h
  user/attilio/vmobj-readlock/sys/sys/syscall.h
  user/attilio/vmobj-readlock/sys/sys/syscall.mk
  user/attilio/vmobj-readlock/sys/sys/sysproto.h
  user/attilio/vmobj-readlock/sys/vm/vm_page.c
Directory Properties:
  user/attilio/vmobj-readlock/sys/   (props changed)
  user/attilio/vmobj-readlock/sys/conf/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/common/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/compiler/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/debugger/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/events/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/executer/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/hardware/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/namespace/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/parser/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/resources/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/tables/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/components/utilities/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/include/   (props changed)
  user/attilio/vmobj-readlock/sys/contrib/dev/acpica/os_specific/   (props changed)

Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/db_trace.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/amd64/amd64/db_trace.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/amd64/amd64/db_trace.c	Wed May 22 15:15:05 2013	(r250910)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/kdb.h>
 #include <sys/proc.h>
+#include <sys/smp.h>
 #include <sys/stack.h>
 #include <sys/sysent.h>
 
@@ -63,6 +64,8 @@ static db_varfcn_t db_frame;
 static db_varfcn_t db_rsp;
 static db_varfcn_t db_ss;
 
+CTASSERT(sizeof(struct dbreg) == sizeof(((struct pcpu *)NULL)->pc_dbreg));
+
 /*
  * Machine register set.
  */
@@ -591,64 +594,82 @@ db_md_set_watchpoint(addr, size)
 	db_expr_t addr;
 	db_expr_t size;
 {
-	struct dbreg d;
-	int avail, i, wsize;
+	struct dbreg *d;
+	struct pcpu *pc;
+	int avail, c, cpu, i, wsize;
 
-	fill_dbregs(NULL, &d);
+	d = (struct dbreg *)PCPU_PTR(dbreg);
+	cpu = PCPU_GET(cpuid);
+	fill_dbregs(NULL, d);
 
 	avail = 0;
-	for(i = 0; i < 4; i++) {
-		if (!DBREG_DR7_ENABLED(d.dr[7], i))
+	for (i = 0; i < 4; i++) {
+		if (!DBREG_DR7_ENABLED(d->dr[7], i))
 			avail++;
 	}
 
 	if (avail * 8 < size)
 		return (-1);
 
-	for (i = 0; i < 4 && (size > 0); i++) {
-		if (!DBREG_DR7_ENABLED(d.dr[7], i)) {
+	for (i = 0; i < 4 && size > 0; i++) {
+		if (!DBREG_DR7_ENABLED(d->dr[7], i)) {
 			if (size >= 8 || (avail == 1 && size > 4))
 				wsize = 8;
 			else if (size > 2)
 				wsize = 4;
 			else
 				wsize = size;
-			amd64_set_watch(i, addr, wsize,
-				       DBREG_DR7_WRONLY, &d);
+			amd64_set_watch(i, addr, wsize, DBREG_DR7_WRONLY, d);
 			addr += wsize;
 			size -= wsize;
 			avail--;
 		}
 	}
 
-	set_dbregs(NULL, &d);
+	set_dbregs(NULL, d);
+	CPU_FOREACH(c) {
+		if (c == cpu)
+			continue;
+		pc = pcpu_find(c);
+		memcpy(pc->pc_dbreg, d, sizeof(*d));
+		pc->pc_dbreg_cmd = PC_DBREG_CMD_LOAD;
+	}
 
-	return(0);
+	return (0);
 }
 
-
 int
 db_md_clr_watchpoint(addr, size)
 	db_expr_t addr;
 	db_expr_t size;
 {
-	struct dbreg d;
-	int i;
+	struct dbreg *d;
+	struct pcpu *pc;
+	int i, c, cpu;
 
-	fill_dbregs(NULL, &d);
+	d = (struct dbreg *)PCPU_PTR(dbreg);
+	cpu = PCPU_GET(cpuid);
+	fill_dbregs(NULL, d);
 
-	for(i = 0; i < 4; i++) {
-		if (DBREG_DR7_ENABLED(d.dr[7], i)) {
-			if ((DBREG_DRX((&d), i) >= addr) &&
-			    (DBREG_DRX((&d), i) < addr+size))
-				amd64_clr_watch(i, &d);
+	for (i = 0; i < 4; i++) {
+		if (DBREG_DR7_ENABLED(d->dr[7], i)) {
+			if (DBREG_DRX((d), i) >= addr &&
+			    DBREG_DRX((d), i) < addr + size)
+				amd64_clr_watch(i, d);
 
 		}
 	}
 
-	set_dbregs(NULL, &d);
+	set_dbregs(NULL, d);
+	CPU_FOREACH(c) {
+		if (c == cpu)
+			continue;
+		pc = pcpu_find(c);
+		memcpy(pc->pc_dbreg, d, sizeof(*d));
+		pc->pc_dbreg_cmd = PC_DBREG_CMD_LOAD;
+	}
 
-	return(0);
+	return (0);
 }
 
 
@@ -699,3 +720,17 @@ db_md_list_watchpoints()
 	}
 	db_printf("\n");
 }
+
+void
+amd64_db_resume_dbreg(void)
+{
+	struct dbreg *d;
+
+	switch (PCPU_GET(dbreg_cmd)) {
+	case PC_DBREG_CMD_LOAD:
+		d = (struct dbreg *)PCPU_PTR(dbreg);
+		set_dbregs(NULL, d);
+		PCPU_SET(dbreg_cmd, PC_DBREG_CMD_NONE);
+		break;
+	}
+}

Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/machdep.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/amd64/amd64/machdep.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/amd64/amd64/machdep.c	Wed May 22 15:15:05 2013	(r250910)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_maxmem.h"
 #include "opt_mp_watchdog.h"
 #include "opt_perfmon.h"
+#include "opt_platform.h"
 #include "opt_sched.h"
 #include "opt_kdtrace.h"
 
@@ -133,6 +134,9 @@ __FBSDID("$FreeBSD$");
 #ifdef SMP
 #include <machine/smp.h>
 #endif
+#ifdef FDT
+#include <x86/fdt.h>
+#endif
 
 #ifdef DEV_ATPIC
 #include <x86/isa/icu.h>
@@ -1886,6 +1890,10 @@ hammer_time(u_int64_t modulep, u_int64_t
 
 	cpu_probe_amdc1e();
 
+#ifdef FDT
+	x86_init_fdt();
+#endif
+
 	/* Location of kernel stack for locore */
 	return ((u_int64_t)thread0.td_pcb);
 }

Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/amd64/amd64/mp_machdep.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/amd64/amd64/mp_machdep.c	Wed May 22 15:15:05 2013	(r250910)
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_cpu.h"
+#include "opt_ddb.h"
 #include "opt_kstack_pages.h"
 #include "opt_sched.h"
 #include "opt_smp.h"
@@ -1396,6 +1397,10 @@ cpustop_handler(void)
 	CPU_CLR_ATOMIC(cpu, &started_cpus);
 	CPU_CLR_ATOMIC(cpu, &stopped_cpus);
 
+#ifdef DDB
+	amd64_db_resume_dbreg();
+#endif
+
 	if (cpu == 0 && cpustop_restartfunc != NULL) {
 		cpustop_restartfunc();
 		cpustop_restartfunc = NULL;

Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c	Wed May 22 15:15:05 2013	(r250910)
@@ -4230,13 +4230,8 @@ pmap_zero_page_idle(vm_page_t m)
 void
 pmap_copy_page(vm_page_t msrc, vm_page_t mdst)
 {
-	vm_offset_t dst, src;
-
-	if ((msrc->oflags & VPO_BUSY) == 0)
-		VM_OBJECT_ASSERT_LOCKED(msrc->object);
-
-	src = PHYS_TO_DMAP(VM_PAGE_TO_PHYS(msrc));
-	dst = PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mdst));
+	vm_offset_t src = PHYS_TO_DMAP(VM_PAGE_TO_PHYS(msrc));
+	vm_offset_t dst = PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mdst));
 
 	pagecopy((void *)src, (void *)dst);
 }
@@ -5541,4 +5536,16 @@ DB_SHOW_COMMAND(pte, pmap_print_pte)
 	pte = pmap_pde_to_pte(pde, va);
 	db_printf(" pte %#016lx\n", *pte);
 }
+
+DB_SHOW_COMMAND(phys2dmap, pmap_phys2dmap)
+{
+	vm_paddr_t a;
+
+	if (have_addr) {
+		a = (vm_paddr_t)addr;
+		db_printf("0x%jx\n", (uintmax_t)PHYS_TO_DMAP(a));
+	} else {
+		db_printf("show phys2dmap addr\n");
+	}
+}
 #endif

Copied: user/attilio/vmobj-readlock/sys/amd64/include/fdt.h (from r250886, user/attilio/vmcontention/sys/amd64/include/fdt.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmobj-readlock/sys/amd64/include/fdt.h	Wed May 22 15:15:05 2013	(r250910, copy of r250886, user/attilio/vmcontention/sys/amd64/include/fdt.h)
@@ -0,0 +1,6 @@
+/*-
+ * This file is in the public domain.
+ */
+/* $FreeBSD$ */
+
+#include <x86/fdt.h>

Modified: user/attilio/vmobj-readlock/sys/amd64/include/md_var.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/amd64/include/md_var.h	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/amd64/include/md_var.h	Wed May 22 15:15:05 2013	(r250910)
@@ -117,5 +117,6 @@ void	minidumpsys(struct dumperinfo *);
 struct savefpu *get_pcb_user_save_td(struct thread *td);
 struct savefpu *get_pcb_user_save_pcb(struct pcb *pcb);
 struct pcb *get_pcb_td(struct thread *td);
+void	amd64_db_resume_dbreg(void);
 
 #endif /* !_MACHINE_MD_VAR_H_ */

Modified: user/attilio/vmobj-readlock/sys/amd64/include/metadata.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/amd64/include/metadata.h	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/amd64/include/metadata.h	Wed May 22 15:15:05 2013	(r250910)
@@ -31,5 +31,6 @@
 
 #define	MODINFOMD_SMAP		0x1001
 #define	MODINFOMD_SMAP_XATTR	0x1002
+#define	MODINFOMD_DTBP		0x1003
 
 #endif /* !_MACHINE_METADATA_H_ */

Copied: user/attilio/vmobj-readlock/sys/amd64/include/ofw_machdep.h (from r250886, user/attilio/vmcontention/sys/amd64/include/ofw_machdep.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmobj-readlock/sys/amd64/include/ofw_machdep.h	Wed May 22 15:15:05 2013	(r250910, copy of r250886, user/attilio/vmcontention/sys/amd64/include/ofw_machdep.h)
@@ -0,0 +1,6 @@
+/*-
+ * This file is in the public domain.
+ */
+/* $FreeBSD$ */
+
+#include <x86/ofw_machdep.h>

Modified: user/attilio/vmobj-readlock/sys/amd64/include/pcpu.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/amd64/include/pcpu.h	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/amd64/include/pcpu.h	Wed May 22 15:15:05 2013	(r250910)
@@ -78,9 +78,14 @@
 	struct system_segment_descriptor *pc_tss;			\
 	u_int	pc_cmci_mask		/* MCx banks for CMCI */	\
 	PCPU_XEN_FIELDS;						\
-	char	__pad[293]		/* be divisor of PAGE_SIZE	\
+	uint64_t pc_dbreg[16];		/* ddb debugging regs */	\
+	int pc_dbreg_cmd;		/* ddb debugging reg cmd */	\
+	char	__pad[161]		/* be divisor of PAGE_SIZE	\
 					   after cache alignment */
 
+#define	PC_DBREG_CMD_NONE	0
+#define	PC_DBREG_CMD_LOAD	1
+
 #ifdef _KERNEL
 
 #ifdef lint

Modified: user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c	Wed May 22 15:15:05 2013	(r250910)
@@ -3731,9 +3731,6 @@ void
 pmap_copy_page(vm_page_t src, vm_page_t dst)
 {
 
-	if ((src->oflags & VPO_BUSY) == 0)
-		VM_OBJECT_ASSERT_LOCKED(src->object);
-
 	if (_arm_memcpy && PAGE_SIZE >= _min_memcpy_size &&
 	    _arm_memcpy((void *)VM_PAGE_TO_PHYS(dst),
 	    (void *)VM_PAGE_TO_PHYS(src), PAGE_SIZE, IS_PHYSICAL) == 0)

Modified: user/attilio/vmobj-readlock/sys/arm/arm/pmap.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/arm/arm/pmap.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/arm/arm/pmap.c	Wed May 22 15:15:05 2013	(r250910)
@@ -4413,9 +4413,6 @@ pmap_copy_page(vm_page_t src, vm_page_t 
 	vm_offset_t srcpg, dstpg;
 #endif
 
-	if ((src->oflags & VPO_BUSY) == 0)
-		VM_OBJECT_ASSERT_LOCKED(src->object);
-
 	cpu_dcache_wbinv_all();
 	cpu_l2cache_wbinv_all();
 	if (_arm_memcpy && PAGE_SIZE >= _min_memcpy_size &&

Modified: user/attilio/vmobj-readlock/sys/arm/arm/stack_machdep.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/arm/arm/stack_machdep.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/arm/arm/stack_machdep.c	Wed May 22 15:15:05 2013	(r250910)
@@ -36,6 +36,13 @@ __FBSDID("$FreeBSD$");
 #include <machine/pcb.h>
 #include <machine/stack.h>
 
+/*
+ * This code makes assumptions about the stack layout. These are correct
+ * when using APCS (the old ABI), but are no longer true with AAPCS and the
+ * ARM EABI. There is also an issue with clang and llvm when building for
+ * APCS where it lays out the stack incorrectly. Because of this we disable
+ * this when building for ARM EABI or when building with clang.
+ */
 static void
 stack_capture(struct stack *st, u_int32_t *frame)
 {
@@ -61,6 +68,11 @@ stack_save_td(struct stack *st, struct t
 	if (TD_IS_RUNNING(td))
 		panic("stack_save_td: running");
 
+	/*
+	 * This register, the frame pointer, is incorrect for the ARM EABI
+	 * as it doesn't have a frame pointer, however it's value is not used
+	 * when building for EABI.
+	 */
 	frame = (u_int32_t *)td->td_pcb->un_32.pcb32_r11;
 	stack_zero(st);
 	stack_capture(st, frame);

Modified: user/attilio/vmobj-readlock/sys/arm/ti/ti_mmchs.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/arm/ti/ti_mmchs.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/arm/ti/ti_mmchs.c	Wed May 22 15:15:05 2013	(r250910)
@@ -1747,7 +1747,7 @@ ti_mmchs_attach(device_t dev)
 	sc->host.host_ocr = MMC_OCR_290_300 | MMC_OCR_300_310;
 	sc->host.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
 
-	device_add_child(dev, "mmc", sc->device_id);
+	device_add_child(dev, "mmc", 0);
 
 	device_set_ivars(dev, &sc->host);
 	err = bus_generic_attach(dev);

Modified: user/attilio/vmobj-readlock/sys/cam/ata/ata_da.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/cam/ata/ata_da.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/cam/ata/ata_da.c	Wed May 22 15:15:05 2013	(r250910)
@@ -93,6 +93,10 @@ typedef enum {
 	ADA_Q_4K		= 0x01,
 } ada_quirks;
 
+#define ADA_Q_BIT_STRING	\
+	"\020"			\
+	"\0014K"
+
 typedef enum {
 	ADA_CCB_RAHEAD		= 0x01,
 	ADA_CCB_WCACHE		= 0x02,
@@ -1278,6 +1282,7 @@ adaregister(struct cam_periph *periph, v
 		dp->secsize, dp->heads,
 		dp->secs_per_track, dp->cylinders);
 	xpt_announce_periph(periph, announce_buf);
+	xpt_announce_quirks(periph, softc->quirks, ADA_Q_BIT_STRING);
 	if (legacy_id >= 0)
 		printf("%s%d: Previously was known as ad%d\n",
 		       periph->periph_name, periph->unit_number, legacy_id);

Modified: user/attilio/vmobj-readlock/sys/cam/cam_xpt.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/cam/cam_xpt.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/cam/cam_xpt.c	Wed May 22 15:15:05 2013	(r250910)
@@ -1084,6 +1084,15 @@ xpt_announce_periph(struct cam_periph *p
 		       periph->unit_number, announce_string);
 }
 
+void
+xpt_announce_quirks(struct cam_periph *periph, int quirks, char *bit_string)
+{
+	if (quirks != 0) {
+		printf("%s%d: quirks=0x%b\n", periph->periph_name,
+		    periph->unit_number, quirks, bit_string);
+	}
+}
+
 int
 xpt_getattr(char *buf, size_t len, const char *attr, struct cam_path *path)
 {

Modified: user/attilio/vmobj-readlock/sys/cam/cam_xpt_periph.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/cam/cam_xpt_periph.h	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/cam/cam_xpt_periph.h	Wed May 22 15:15:05 2013	(r250910)
@@ -46,6 +46,8 @@ void		xpt_remove_periph(struct cam_perip
 				  int topology_lock_held);
 void		xpt_announce_periph(struct cam_periph *periph,
 				    char *announce_string);
+void		xpt_announce_quirks(struct cam_periph *periph,
+				    int quirks, char *bit_string);
 #endif
 
 #endif /* _CAM_CAM_XPT_PERIPH_H */

Modified: user/attilio/vmobj-readlock/sys/cam/scsi/scsi_cd.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/cam/scsi/scsi_cd.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/cam/scsi/scsi_cd.c	Wed May 22 15:15:05 2013	(r250910)
@@ -92,6 +92,14 @@ typedef enum {
 	CD_Q_10_BYTE_ONLY	= 0x10
 } cd_quirks;
 
+#define CD_Q_BIT_STRING		\
+	"\020"			\
+	"\001NO_TOUCH"		\
+	"\002BCD_TRACKS"	\
+	"\003NO_CHANGER"	\
+	"\004CHANGER"		\
+	"\00510_BYTE_ONLY"
+
 typedef enum {
 	CD_FLAG_INVALID		= 0x0001,
 	CD_FLAG_NEW_DISC	= 0x0002,
@@ -1867,6 +1875,8 @@ cddone(struct cam_periph *periph, union 
 		free(rdcap, M_SCSICD);
 		if (announce_buf[0] != '\0') {
 			xpt_announce_periph(periph, announce_buf);
+			xpt_announce_quirks(periph, softc->quirks,
+			    CD_Q_BIT_STRING);
 			if (softc->flags & CD_FLAG_CHANGER)
 				cdchangerschedule(softc);
 			/*

Modified: user/attilio/vmobj-readlock/sys/cam/scsi/scsi_ch.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/cam/scsi/scsi_ch.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/cam/scsi/scsi_ch.c	Wed May 22 15:15:05 2013	(r250910)
@@ -125,6 +125,10 @@ typedef enum {
 	CH_Q_NO_DBD	= 0x01
 } ch_quirks;
 
+#define CH_Q_BIT_STRING	\
+	"\020"		\
+	"\001NO_DBD"
+
 #define ccb_state	ppriv_field0
 #define ccb_bp		ppriv_ptr1
 
@@ -706,8 +710,11 @@ chdone(struct cam_periph *periph, union 
 				announce_buf[0] = '\0';
 			}
 		}
-		if (announce_buf[0] != '\0')
+		if (announce_buf[0] != '\0') {
 			xpt_announce_periph(periph, announce_buf);
+			xpt_announce_quirks(periph, softc->quirks,
+			    CH_Q_BIT_STRING);
+		}
 		softc->state = CH_STATE_NORMAL;
 		free(mode_header, M_SCSICH);
 		/*

Modified: user/attilio/vmobj-readlock/sys/cam/scsi/scsi_da.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/cam/scsi/scsi_da.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/cam/scsi/scsi_da.c	Wed May 22 15:15:05 2013	(r250910)
@@ -99,6 +99,13 @@ typedef enum {
 	DA_Q_4K			= 0x08
 } da_quirks;
 
+#define DA_Q_BIT_STRING		\
+	"\020"			\
+	"\001NO_SYNC_CACHE"	\
+	"\002NO_6_BYTE"		\
+	"\003NO_PREVENT"	\
+	"\0044K"
+
 typedef enum {
 	DA_CCB_PROBE_RC		= 0x01,
 	DA_CCB_PROBE_RC16	= 0x02,
@@ -2957,7 +2964,8 @@ dadone(struct cam_periph *periph, union 
 				taskqueue_enqueue(taskqueue_thread,
 						  &softc->sysctl_task);
 				xpt_announce_periph(periph, announce_buf);
-
+				xpt_announce_quirks(periph, softc->quirks,
+				    DA_Q_BIT_STRING);
 			} else {
 				xpt_print(periph->path, "fatal error, "
 				    "could not acquire reference count\n");

Modified: user/attilio/vmobj-readlock/sys/cam/scsi/scsi_sa.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/cam/scsi/scsi_sa.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/cam/scsi/scsi_sa.c	Wed May 22 15:15:05 2013	(r250910)
@@ -173,6 +173,17 @@ typedef enum {
 	SA_QUIRK_NO_CPAGE	= 0x80	/* Don't use DEVICE COMPRESSION page */
 } sa_quirks;
 
+#define SA_QUIRK_BIT_STRING	\
+	"\020"			\
+	"\001NOCOMP"		\
+	"\002FIXED"		\
+	"\003VARIABLE"		\
+	"\0042FM"		\
+	"\0051FM"		\
+	"\006NODREAD"		\
+	"\007NO_MODESEL"	\
+	"\010NO_CPAGE"
+
 #define	SAMODE(z)	(dev2unit(z) & 0x3)
 #define	SADENSITY(z)	((dev2unit(z) >> 2) & 0x3)
 #define	SA_IS_CTRL(z)	(dev2unit(z) & (1 << 4))
@@ -1546,6 +1557,7 @@ saregister(struct cam_periph *periph, vo
 	xpt_register_async(AC_LOST_DEVICE, saasync, periph, periph->path);
 
 	xpt_announce_periph(periph, NULL);
+	xpt_announce_quirks(periph, softc->quirks, SA_QUIRK_BIT_STRING);
 
 	return (CAM_REQ_CMP);
 }

Modified: user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_misc.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_misc.c	Wed May 22 15:15:05 2013	(r250910)
@@ -198,8 +198,8 @@ freebsd32_wait6(struct thread *td, struc
 		bzero(sip, sizeof(*sip));
 	} else
 		sip = NULL;
-	error = kern_wait6(td, uap->idtype, uap->id, &status, uap->options,
-	    wrup, sip);
+	error = kern_wait6(td, uap->idtype, PAIR32TO64(id_t, uap->id),
+	    &status, uap->options, wrup, sip);
 	if (error != 0)
 		return (error);
 	if (uap->status != NULL)

Modified: user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_proto.h	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_proto.h	Wed May 22 15:15:05 2013	(r250910)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles 
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib 
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_
@@ -574,8 +574,10 @@ struct freebsd32_pselect_args {
 	char ts_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * ts; char ts_r_[PADR_(const struct timespec32 *)];
 	char sm_l_[PADL_(const sigset_t *)]; const sigset_t * sm; char sm_r_[PADR_(const sigset_t *)];
 };
+#ifdef PAD64_REQUIRED
 struct freebsd32_posix_fallocate_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 offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
 	char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
 	char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
@@ -583,6 +585,7 @@ struct freebsd32_posix_fallocate_args {
 };
 struct freebsd32_posix_fadvise_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 offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
 	char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
 	char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
@@ -591,12 +594,40 @@ struct freebsd32_posix_fadvise_args {
 };
 struct freebsd32_wait6_args {
 	char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
-	char id_l_[PADL_(int)]; int id; char id_r_[PADR_(int)];
+	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+	char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
+	char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
 	char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
 	char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
 	char wrusage_l_[PADL_(struct wrusage32 *)]; struct wrusage32 * wrusage; char wrusage_r_[PADR_(struct wrusage32 *)];
 	char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
 };
+#else
+struct freebsd32_posix_fallocate_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
+	char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
+	char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
+	char len2_l_[PADL_(uint32_t)]; uint32_t len2; char len2_r_[PADR_(uint32_t)];
+};
+struct freebsd32_posix_fadvise_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
+	char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
+	char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
+	char len2_l_[PADL_(uint32_t)]; uint32_t len2; char len2_r_[PADR_(uint32_t)];
+	char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
+};
+struct freebsd32_wait6_args {
+	char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+	char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
+	char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
+	char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
+	char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
+	char wrusage_l_[PADL_(struct wrusage32 *)]; struct wrusage32 * wrusage; char wrusage_r_[PADR_(struct wrusage32 *)];
+	char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
+};
+#endif
 #if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
 #define PAD64_REQUIRED
 #endif
@@ -706,9 +737,15 @@ int	freebsd32_semctl(struct thread *, st
 int	freebsd32_msgctl(struct thread *, struct freebsd32_msgctl_args *);
 int	freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *);
 int	freebsd32_pselect(struct thread *, struct freebsd32_pselect_args *);
+#ifdef PAD64_REQUIRED
 int	freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_args *);
 int	freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *);
 int	freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *);
+#else
+int	freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_args *);
+int	freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *);
+int	freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *);
+#endif
 
 #ifdef COMPAT_43
 
@@ -777,6 +814,9 @@ struct ofreebsd32_getdirentries_args {
 #ifdef PAD64_REQUIRED
 #else
 #endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
 int	ofreebsd32_lseek(struct thread *, struct ofreebsd32_lseek_args *);
 int	ofreebsd32_stat(struct thread *, struct ofreebsd32_stat_args *);
 int	ofreebsd32_lstat(struct thread *, struct ofreebsd32_lstat_args *);
@@ -842,6 +882,9 @@ struct freebsd4_freebsd32_sigreturn_args
 #ifdef PAD64_REQUIRED
 #else
 #endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
 int	freebsd4_freebsd32_getfsstat(struct thread *, struct freebsd4_freebsd32_getfsstat_args *);
 int	freebsd4_freebsd32_statfs(struct thread *, struct freebsd4_freebsd32_statfs_args *);
 int	freebsd4_freebsd32_fstatfs(struct thread *, struct freebsd4_freebsd32_fstatfs_args *);
@@ -909,6 +952,9 @@ struct freebsd6_freebsd32_ftruncate_args
 #ifdef PAD64_REQUIRED
 #else
 #endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
 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 *);
@@ -946,6 +992,9 @@ struct freebsd7_freebsd32_shmctl_args {
 #ifdef PAD64_REQUIRED
 #else
 #endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
 int	freebsd7_freebsd32_semctl(struct thread *, struct freebsd7_freebsd32_semctl_args *);
 int	freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *);
 int	freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *);
@@ -1086,6 +1135,9 @@ int	freebsd7_freebsd32_shmctl(struct thr
 #define	FREEBSD32_SYS_AUE_freebsd32_posix_fallocate	AUE_NULL
 #define	FREEBSD32_SYS_AUE_freebsd32_posix_fadvise	AUE_NULL
 #define	FREEBSD32_SYS_AUE_freebsd32_wait6	AUE_WAIT6
+#define	FREEBSD32_SYS_AUE_freebsd32_posix_fallocate	AUE_NULL
+#define	FREEBSD32_SYS_AUE_freebsd32_posix_fadvise	AUE_NULL
+#define	FREEBSD32_SYS_AUE_freebsd32_wait6	AUE_WAIT6
 
 #undef PAD_
 #undef PADL_

Modified: user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscall.h	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscall.h	Wed May 22 15:15:05 2013	(r250910)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles 
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib 
  */
 
 #define	FREEBSD32_SYS_syscall	0
@@ -430,6 +430,9 @@
 #define	FREEBSD32_SYS_freebsd32_posix_fallocate	530
 #define	FREEBSD32_SYS_freebsd32_posix_fadvise	531
 #define	FREEBSD32_SYS_freebsd32_wait6	532
+#define	FREEBSD32_SYS_freebsd32_posix_fallocate	530
+#define	FREEBSD32_SYS_freebsd32_posix_fadvise	531
+#define	FREEBSD32_SYS_freebsd32_wait6	532
 #define	FREEBSD32_SYS_cap_rights_limit	533
 #define	FREEBSD32_SYS_cap_ioctls_limit	534
 #define	FREEBSD32_SYS_cap_ioctls_get	535

Modified: user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscalls.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_syscalls.c	Wed May 22 15:15:05 2013	(r250910)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles 
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib 
  */
 
 const char *freebsd32_syscallnames[] = {
@@ -553,9 +553,15 @@ const char *freebsd32_syscallnames[] = {
 	"rctl_get_limits",			/* 527 = rctl_get_limits */
 	"rctl_add_rule",			/* 528 = rctl_add_rule */
 	"rctl_remove_rule",			/* 529 = rctl_remove_rule */
+#ifdef PAD64_REQUIRED
+	"freebsd32_posix_fallocate",			/* 530 = freebsd32_posix_fallocate */
+	"freebsd32_posix_fadvise",			/* 531 = freebsd32_posix_fadvise */
+	"freebsd32_wait6",			/* 532 = freebsd32_wait6 */
+#else
 	"freebsd32_posix_fallocate",			/* 530 = freebsd32_posix_fallocate */
 	"freebsd32_posix_fadvise",			/* 531 = freebsd32_posix_fadvise */
 	"freebsd32_wait6",			/* 532 = freebsd32_wait6 */
+#endif
 	"cap_rights_limit",			/* 533 = cap_rights_limit */
 	"cap_ioctls_limit",			/* 534 = cap_ioctls_limit */
 	"cap_ioctls_get",			/* 535 = cap_ioctls_get */

Modified: user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_sysent.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_sysent.c	Wed May 22 15:15:05 2013	(r250910)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles 
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib 
  */
 
 #include "opt_compat.h"
@@ -590,9 +590,15 @@ struct sysent freebsd32_sysent[] = {
 	{ AS(rctl_get_limits_args), (sy_call_t *)sys_rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 527 = rctl_get_limits */
 	{ AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 528 = rctl_add_rule */
 	{ AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 529 = rctl_remove_rule */
+#ifdef PAD64_REQUIRED
+	{ AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 530 = freebsd32_posix_fallocate */
+	{ AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 531 = freebsd32_posix_fadvise */
+	{ AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC },	/* 532 = freebsd32_wait6 */
+#else
 	{ AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 530 = freebsd32_posix_fallocate */
 	{ AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 531 = freebsd32_posix_fadvise */
 	{ AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC },	/* 532 = freebsd32_wait6 */
+#endif
 	{ AS(cap_rights_limit_args), (sy_call_t *)sys_cap_rights_limit, AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 533 = cap_rights_limit */
 	{ AS(cap_ioctls_limit_args), (sy_call_t *)sys_cap_ioctls_limit, AUE_CAP_IOCTLS_LIMIT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 534 = cap_ioctls_limit */
 	{ AS(cap_ioctls_get_args), (sy_call_t *)sys_cap_ioctls_get, AUE_CAP_IOCTLS_GET, NULL, 0, 0, 0, SY_THR_STATIC },	/* 535 = cap_ioctls_get */

Modified: user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_systrace_args.c	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/compat/freebsd32/freebsd32_systrace_args.c	Wed May 22 15:15:05 2013	(r250910)
@@ -3053,6 +3053,47 @@ systrace_args(int sysnum, void *params, 
 		*n_args = 4;
 		break;
 	}
+#ifdef PAD64_REQUIRED
+	/* freebsd32_posix_fallocate */
+	case 530: {
+		struct freebsd32_posix_fallocate_args *p = params;
+		iarg[0] = p->fd; /* int */
+		iarg[1] = p->pad; /* int */
+		uarg[2] = p->offset1; /* uint32_t */
+		uarg[3] = p->offset2; /* uint32_t */
+		uarg[4] = p->len1; /* uint32_t */
+		uarg[5] = p->len2; /* uint32_t */
+		*n_args = 6;
+		break;
+	}
+	/* freebsd32_posix_fadvise */
+	case 531: {
+		struct freebsd32_posix_fadvise_args *p = params;
+		iarg[0] = p->fd; /* int */
+		iarg[1] = p->pad; /* int */
+		uarg[2] = p->offset1; /* uint32_t */
+		uarg[3] = p->offset2; /* uint32_t */
+		uarg[4] = p->len1; /* uint32_t */
+		uarg[5] = p->len2; /* uint32_t */
+		iarg[6] = p->advice; /* int */
+		*n_args = 7;
+		break;
+	}
+	/* freebsd32_wait6 */
+	case 532: {
+		struct freebsd32_wait6_args *p = params;
+		iarg[0] = p->idtype; /* int */
+		iarg[1] = p->pad; /* int */
+		uarg[2] = p->id1; /* uint32_t */
+		uarg[3] = p->id2; /* uint32_t */
+		uarg[4] = (intptr_t) p->status; /* int * */
+		iarg[5] = p->options; /* int */
+		uarg[6] = (intptr_t) p->wrusage; /* struct wrusage32 * */
+		uarg[7] = (intptr_t) p->info; /* siginfo_t * */
+		*n_args = 8;
+		break;
+	}
+#else
 	/* freebsd32_posix_fallocate */
 	case 530: {
 		struct freebsd32_posix_fallocate_args *p = params;
@@ -3080,14 +3121,16 @@ systrace_args(int sysnum, void *params, 
 	case 532: {
 		struct freebsd32_wait6_args *p = params;
 		iarg[0] = p->idtype; /* int */
-		iarg[1] = p->id; /* int */
-		uarg[2] = (intptr_t) p->status; /* int * */
-		iarg[3] = p->options; /* int */
-		uarg[4] = (intptr_t) p->wrusage; /* struct wrusage32 * */
-		uarg[5] = (intptr_t) p->info; /* siginfo_t * */
-		*n_args = 6;
+		uarg[1] = p->id1; /* uint32_t */
+		uarg[2] = p->id2; /* uint32_t */
+		uarg[3] = (intptr_t) p->status; /* int * */
+		iarg[4] = p->options; /* int */
+		uarg[5] = (intptr_t) p->wrusage; /* struct wrusage32 * */
+		uarg[6] = (intptr_t) p->info; /* siginfo_t * */
+		*n_args = 7;
 		break;
 	}
+#endif
 	/* cap_rights_limit */
 	case 533: {
 		struct cap_rights_limit_args *p = params;
@@ -8261,6 +8304,7 @@ systrace_entry_setargdesc(int sysnum, in
 			break;
 		};
 		break;
+#ifdef PAD64_REQUIRED
 	/* freebsd32_posix_fallocate */
 	case 530:
 		switch(ndx) {
@@ -8268,7 +8312,7 @@ systrace_entry_setargdesc(int sysnum, in
 			p = "int";
 			break;
 		case 1:
-			p = "uint32_t";
+			p = "int";
 			break;
 		case 2:
 			p = "uint32_t";
@@ -8279,6 +8323,9 @@ systrace_entry_setargdesc(int sysnum, in
 		case 4:
 			p = "uint32_t";
 			break;
+		case 5:
+			p = "uint32_t";
+			break;
 		default:
 			break;
 		};
@@ -8290,7 +8337,7 @@ systrace_entry_setargdesc(int sysnum, in
 			p = "int";
 			break;
 		case 1:
-			p = "uint32_t";
+			p = "int";
 			break;
 		case 2:
 			p = "uint32_t";
@@ -8302,6 +8349,9 @@ systrace_entry_setargdesc(int sysnum, in
 			p = "uint32_t";
 			break;
 		case 5:
+			p = "uint32_t";
+			break;
+		case 6:
 			p = "int";
 			break;
 		default:
@@ -8318,21 +8368,104 @@ systrace_entry_setargdesc(int sysnum, in
 			p = "int";
 			break;
 		case 2:
+			p = "uint32_t";
+			break;
+		case 3:
+			p = "uint32_t";
+			break;
+		case 4:
 			p = "int *";
 			break;
+		case 5:
+			p = "int";
+			break;
+		case 6:
+			p = "struct wrusage32 *";
+			break;
+		case 7:
+			p = "siginfo_t *";
+			break;
+		default:
+			break;
+		};
+		break;
+#else
+	/* freebsd32_posix_fallocate */
+	case 530:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "uint32_t";
+			break;
+		case 2:
+			p = "uint32_t";
+			break;
 		case 3:
+			p = "uint32_t";
+			break;
+		case 4:
+			p = "uint32_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* freebsd32_posix_fadvise */
+	case 531:
+		switch(ndx) {
+		case 0:
 			p = "int";
 			break;
+		case 1:
+			p = "uint32_t";
+			break;
+		case 2:
+			p = "uint32_t";
+			break;
+		case 3:
+			p = "uint32_t";
+			break;
 		case 4:
-			p = "struct wrusage32 *";
+			p = "uint32_t";
+			break;
+		case 5:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* freebsd32_wait6 */
+	case 532:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "uint32_t";
+			break;
+		case 2:
+			p = "uint32_t";
+			break;
+		case 3:
+			p = "int *";
+			break;
+		case 4:
+			p = "int";
 			break;
 		case 5:
+			p = "struct wrusage32 *";
+			break;
+		case 6:
 			p = "siginfo_t *";
 			break;
 		default:
 			break;
 		};
 		break;
+#endif
 	/* cap_rights_limit */
 	case 533:
 		switch(ndx) {
@@ -10240,6 +10373,23 @@ systrace_return_setargdesc(int sysnum, i
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
+#ifdef PAD64_REQUIRED
+	/* freebsd32_posix_fallocate */
+	case 530:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* freebsd32_posix_fadvise */
+	case 531:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* freebsd32_wait6 */
+	case 532:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+#else
 	/* freebsd32_posix_fallocate */
 	case 530:
 		if (ndx == 0 || ndx == 1)
@@ -10255,6 +10405,7 @@ systrace_return_setargdesc(int sysnum, i
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
+#endif
 	/* cap_rights_limit */
 	case 533:
 		if (ndx == 0 || ndx == 1)

Modified: user/attilio/vmobj-readlock/sys/compat/freebsd32/syscalls.master
==============================================================================
--- user/attilio/vmobj-readlock/sys/compat/freebsd32/syscalls.master	Wed May 22 15:11:00 2013	(r250909)
+++ user/attilio/vmobj-readlock/sys/compat/freebsd32/syscalls.master	Wed May 22 15:15:05 2013	(r250910)
@@ -994,6 +994,22 @@
 529	AUE_NULL	NOPROTO	{ int rctl_remove_rule(const void *inbufp, \
 				    size_t inbuflen, void *outbufp, \
 				    size_t outbuflen); }
+#ifdef PAD64_REQUIRED
+530	AUE_NULL	STD	{ int freebsd32_posix_fallocate(int fd, \
+				    int pad, \
+				    uint32_t offset1, uint32_t offset2,\
+				    uint32_t len1, uint32_t len2); }
+531	AUE_NULL	STD	{ int freebsd32_posix_fadvise(int fd, \
+				    int pad, \
+				    uint32_t offset1, uint32_t offset2,\
+				    uint32_t len1, uint32_t len2, \

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list