Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Oct 2015 16:25:14 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r288926 - in projects/clang370-import: bin bin/ls/tests lib/libxo release/arm release/doc/en_US.ISO8859-1/relnotes release/doc/share/xml share/mk sys/amd64/amd64 sys/amd64/include sys/c...
Message-ID:  <201510061625.t96GPEhS045625@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Tue Oct  6 16:25:13 2015
New Revision: 288926
URL: https://svnweb.freebsd.org/changeset/base/288926

Log:
  Merge ^/head r288836 through r288925.

Added:
  projects/clang370-import/sys/xen/interface/arch-x86/pmu.h
     - copied unchanged from r288925, head/sys/xen/interface/arch-x86/pmu.h
  projects/clang370-import/sys/xen/interface/errno.h
     - copied unchanged from r288925, head/sys/xen/interface/errno.h
  projects/clang370-import/sys/xen/interface/gcov.h
     - copied unchanged from r288925, head/sys/xen/interface/gcov.h
  projects/clang370-import/sys/xen/interface/hvm/hvm_xs_strings.h
     - copied unchanged from r288925, head/sys/xen/interface/hvm/hvm_xs_strings.h
  projects/clang370-import/sys/xen/interface/hvm/pvdrivers.h
     - copied unchanged from r288925, head/sys/xen/interface/hvm/pvdrivers.h
  projects/clang370-import/sys/xen/interface/pmu.h
     - copied unchanged from r288925, head/sys/xen/interface/pmu.h
  projects/clang370-import/sys/xen/interface/vm_event.h
     - copied unchanged from r288925, head/sys/xen/interface/vm_event.h
Deleted:
  projects/clang370-import/sys/xen/interface/acm.h
  projects/clang370-import/sys/xen/interface/acm_ops.h
  projects/clang370-import/sys/xen/interface/arch-powerpc.h
  projects/clang370-import/sys/xen/interface/elfstructs.h
  projects/clang370-import/sys/xen/interface/foreign/
  projects/clang370-import/sys/xen/interface/libelf.h
  projects/clang370-import/sys/xen/interface/mem_event.h
Modified:
  projects/clang370-import/bin/Makefile
  projects/clang370-import/bin/ls/tests/ls_tests.sh
  projects/clang370-import/lib/libxo/Makefile
  projects/clang370-import/release/arm/BANANAPI.conf
  projects/clang370-import/release/arm/CUBIEBOARD.conf
  projects/clang370-import/release/arm/CUBIEBOARD2.conf
  projects/clang370-import/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/clang370-import/release/doc/share/xml/sponsor.ent
  projects/clang370-import/share/mk/bsd.own.mk
  projects/clang370-import/sys/amd64/amd64/support.S
  projects/clang370-import/sys/amd64/include/intr_machdep.h
  projects/clang370-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/clang370-import/sys/dev/xen/blkfront/blkfront.c
  projects/clang370-import/sys/i386/i386/support.s
  projects/clang370-import/sys/i386/include/intr_machdep.h
  projects/clang370-import/sys/kern/sys_process.c
  projects/clang370-import/sys/kern/uipc_mbuf.c
  projects/clang370-import/sys/netinet/tcp_input.c
  projects/clang370-import/sys/powerpc/powerpc/swtch32.S
  projects/clang370-import/sys/powerpc/powerpc/swtch64.S
  projects/clang370-import/sys/vm/swap_pager.c
  projects/clang370-import/sys/vm/vm_kern.c
  projects/clang370-import/sys/xen/interface/arch-arm.h
  projects/clang370-import/sys/xen/interface/arch-arm/hvm/save.h
  projects/clang370-import/sys/xen/interface/arch-x86/cpuid.h
  projects/clang370-import/sys/xen/interface/arch-x86/hvm/save.h
  projects/clang370-import/sys/xen/interface/arch-x86/xen-mca.h
  projects/clang370-import/sys/xen/interface/arch-x86/xen-x86_32.h
  projects/clang370-import/sys/xen/interface/arch-x86/xen-x86_64.h
  projects/clang370-import/sys/xen/interface/arch-x86/xen.h
  projects/clang370-import/sys/xen/interface/callback.h
  projects/clang370-import/sys/xen/interface/dom0_ops.h
  projects/clang370-import/sys/xen/interface/domctl.h
  projects/clang370-import/sys/xen/interface/elfnote.h
  projects/clang370-import/sys/xen/interface/event_channel.h
  projects/clang370-import/sys/xen/interface/features.h
  projects/clang370-import/sys/xen/interface/grant_table.h
  projects/clang370-import/sys/xen/interface/hvm/e820.h
  projects/clang370-import/sys/xen/interface/hvm/hvm_info_table.h
  projects/clang370-import/sys/xen/interface/hvm/hvm_op.h
  projects/clang370-import/sys/xen/interface/hvm/ioreq.h
  projects/clang370-import/sys/xen/interface/hvm/params.h
  projects/clang370-import/sys/xen/interface/hvm/save.h
  projects/clang370-import/sys/xen/interface/io/blkif.h
  projects/clang370-import/sys/xen/interface/io/console.h
  projects/clang370-import/sys/xen/interface/io/fbif.h
  projects/clang370-import/sys/xen/interface/io/kbdif.h
  projects/clang370-import/sys/xen/interface/io/libxenvchan.h
  projects/clang370-import/sys/xen/interface/io/netif.h
  projects/clang370-import/sys/xen/interface/io/pciif.h
  projects/clang370-import/sys/xen/interface/io/protocols.h
  projects/clang370-import/sys/xen/interface/io/ring.h
  projects/clang370-import/sys/xen/interface/io/tpmif.h
  projects/clang370-import/sys/xen/interface/io/usbif.h
  projects/clang370-import/sys/xen/interface/io/vscsiif.h
  projects/clang370-import/sys/xen/interface/io/xenbus.h
  projects/clang370-import/sys/xen/interface/io/xs_wire.h
  projects/clang370-import/sys/xen/interface/kexec.h
  projects/clang370-import/sys/xen/interface/memory.h
  projects/clang370-import/sys/xen/interface/nmi.h
  projects/clang370-import/sys/xen/interface/physdev.h
  projects/clang370-import/sys/xen/interface/platform.h
  projects/clang370-import/sys/xen/interface/sched.h
  projects/clang370-import/sys/xen/interface/sysctl.h
  projects/clang370-import/sys/xen/interface/tmem.h
  projects/clang370-import/sys/xen/interface/trace.h
  projects/clang370-import/sys/xen/interface/vcpu.h
  projects/clang370-import/sys/xen/interface/version.h
  projects/clang370-import/sys/xen/interface/xen-compat.h
  projects/clang370-import/sys/xen/interface/xen.h
  projects/clang370-import/sys/xen/interface/xenoprof.h
  projects/clang370-import/sys/xen/interface/xsm/flask_op.h
  projects/clang370-import/sys/xen/xen_intr.h
  projects/clang370-import/usr.bin/Makefile
  projects/clang370-import/usr.bin/truss/setup.c
  projects/clang370-import/usr.bin/xo/Makefile
  projects/clang370-import/usr.sbin/rpcbind/rpcb_svc_com.c
Directory Properties:
  projects/clang370-import/   (props changed)
  projects/clang370-import/share/   (props changed)
  projects/clang370-import/sys/   (props changed)
  projects/clang370-import/sys/contrib/ipfilter/   (props changed)

Modified: projects/clang370-import/bin/Makefile
==============================================================================
--- projects/clang370-import/bin/Makefile	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/bin/Makefile	Tue Oct  6 16:25:13 2015	(r288926)
@@ -40,21 +40,10 @@ SUBDIR= cat \
 	test \
 	uuidgen
 
-.if ${MK_RCMDS} != "no"
-SUBDIR+=	rcp
-.endif
-
-.if ${MK_SENDMAIL} != "no"
-SUBDIR+=	rmail
-.endif
-
-.if ${MK_TCSH} != "no"
-SUBDIR+=	csh
-.endif
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_RCMDS}+=	rcp
+SUBDIR.${MK_SENDMAIL}+=	rmail
+SUBDIR.${MK_TCSH}+=	csh
+SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.arch.inc.mk>
 

Modified: projects/clang370-import/bin/ls/tests/ls_tests.sh
==============================================================================
--- projects/clang370-import/bin/ls/tests/ls_tests.sh	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/bin/ls/tests/ls_tests.sh	Tue Oct  6 16:25:13 2015	(r288926)
@@ -72,6 +72,8 @@ create_test_inputs()
 	atf_check -e empty -s exit:0 touch 0b00001101
 	atf_check -e empty -s exit:0 touch 0b00001110
 	atf_check -e empty -s exit:0 touch 0b00001111
+
+	atf_check -e empty -s exit:0 sync
 }
 
 KB=1024
@@ -98,6 +100,8 @@ create_test_inputs2()
 		    count=1 oseek=$(( $filesize / $MB )) conv=sparse
 		files="${files} ${filesize}.file"
 	done
+
+	atf_check -e empty -s exit:0 sync
 }
 
 atf_test_case A_flag
@@ -810,14 +814,16 @@ t_flag_body()
 
 	atf_check -e empty -o empty -s exit:0 touch a.file
 	atf_check -e empty -o empty -s exit:0 touch b.file
-	sync
+
+	atf_check -e empty -s exit:0 sync
 
 	atf_check -e empty -o match:'a\.file' -s exit:0 sh -c 'ls -lt | tail -n 1'
 	atf_check -e empty -o match:'b\.file.*a\.file' -s exit:0 ls -Ct
 
 	atf_check -e empty -o empty -s exit:0 rm a.file
 	atf_check -e empty -o empty -s exit:0 sh -c 'echo "i am a" > a.file'
-	sync
+
+	atf_check -e empty -s exit:0 sync
 
 	atf_check -e empty -o match:'b\.file' -s exit:0 sh -c 'ls -lt | tail -n 1'
 	atf_check -e empty -o match:'a\.file.*b\.file' -s exit:0 ls -Ct
@@ -834,17 +840,15 @@ u_flag_body()
 	create_test_dir
 
 	atf_check -e empty -o empty -s exit:0 touch a.file
-	sync
 	atf_check -e empty -o empty -s exit:0 touch b.file
-	sync
+	atf_check -e empty -s exit:0 sync
 
 	atf_check -e empty -o match:'b\.file' -s exit:0 sh -c 'ls -lu | tail -n 1'
 	atf_check -e empty -o match:'a\.file.*b\.file' -s exit:0 ls -Cu
 
 	atf_check -e empty -o empty -s exit:0 sh -c 'echo "i am a" > a.file'
-	sync
 	atf_check -e empty -o match:'i am a' -s exit:0 cat a.file
-	sync
+	atf_check -e empty -s exit:0 sync
 
 	atf_check -e empty -o match:'b\.file' -s exit:0 sh -c 'ls -lu | tail -n 1'
 	atf_check -e empty -o match:'a\.file.*b\.file' -s exit:0 ls -Cu
@@ -924,6 +928,7 @@ atf_test_case 1_flag
 
 atf_init_test_cases()
 {
+	export BLOCKSIZE=512
 
 	atf_add_test_case A_flag
 	atf_add_test_case A_flag_implied_when_root

Modified: projects/clang370-import/lib/libxo/Makefile
==============================================================================
--- projects/clang370-import/lib/libxo/Makefile	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/lib/libxo/Makefile	Tue Oct  6 16:25:13 2015	(r288926)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-LIBXO=	${.CURDIR:H:H}/contrib/libxo
+LIBXOSRC=	${SRCTOP}/contrib/libxo
 
-.PATH:	${LIBXO}/libxo
+.PATH:	${LIBXOSRC}/libxo
 
 LIB=	xo
 SHLIB_MAJOR=0
@@ -11,7 +11,7 @@ SHLIBDIR?=      /lib
 
 SRCS=	libxo.c xo_encoder.c xo_syslog.c
 
-CFLAGS+=-I${LIBXO}/libxo
+CFLAGS+=-I${LIBXOSRC}/libxo
 CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
 
 INCS=	xo.h xo_encoder.h

Modified: projects/clang370-import/release/arm/BANANAPI.conf
==============================================================================
--- projects/clang370-import/release/arm/BANANAPI.conf	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/release/arm/BANANAPI.conf	Tue Oct  6 16:25:13 2015	(r288926)
@@ -19,10 +19,10 @@ export BOARDNAME="BANANAPI"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi"
-	UBOOT_FILES="u-boot.img"
+	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}

Modified: projects/clang370-import/release/arm/CUBIEBOARD.conf
==============================================================================
--- projects/clang370-import/release/arm/CUBIEBOARD.conf	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/release/arm/CUBIEBOARD.conf	Tue Oct  6 16:25:13 2015	(r288926)
@@ -18,10 +18,10 @@ NODOC=1
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard"
-	UBOOT_FILES="u-boot.img"
+	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}

Modified: projects/clang370-import/release/arm/CUBIEBOARD2.conf
==============================================================================
--- projects/clang370-import/release/arm/CUBIEBOARD2.conf	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/release/arm/CUBIEBOARD2.conf	Tue Oct  6 16:25:13 2015	(r288926)
@@ -19,10 +19,10 @@ export BOARDNAME="CUBIEBOARD2"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard2"
-	UBOOT_FILES="u-boot.img"
+	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}

Modified: projects/clang370-import/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- projects/clang370-import/release/doc/en_US.ISO8859-1/relnotes/article.xml	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/release/doc/en_US.ISO8859-1/relnotes/article.xml	Tue Oct  6 16:25:13 2015	(r288926)
@@ -173,6 +173,9 @@
 
       <para revision="272350">The <literal>MK_ARM_EABI</literal>
 	&man.src.conf.5; option has been removed.</para>
+
+      <para revision="285169">The <application>ntp</application> suite
+	has been updated to version 4.2.8p3.</para>
     </sect2>
 
     <sect2 xml:id="userland-programs">
@@ -392,9 +395,63 @@
 	updated to be able to detect &man.zfs.8; and &man.geli.8;
 	filesystems.</para>
 
+      <para revision="284883">The &man.mkimg.1; utility has been
+	updated to include support for <literal>NTFS</literal>
+	filesystems in both <acronym>MBR</acronym> and
+	<acronym>GPT</acronym> partitioning schemes.</para>
+
+      <para revision="285253">The &man.quota.1; utility has been
+	updated to include support for <acronym>IPv6</acronym>.</para>
+
+      <para revision="285420">The &man.jail.8; utility has been
+	updated to include a new flag, <literal>-l</literal>, which
+	ensures a clean environment in the target jail when used.
+	Additionally, &man.jail.8; will run a shell within the target
+	jail when run no commands are specified.</para>
+
       <para revision="285550">The &man.w.1; utility has been updated
 	to display the full IPv6 remote address of the host from which
 	a user is connected.</para>
+
+      <para revision="285685">The &man.jail.8; framework has been
+	updated to allow mounting &man.linprocfs.5; and
+	&man.linsysfs.5; within a jail.</para>
+
+      <para revision="285772" contrib="sponsor"
+	sponsor="&emcisilon;">The &man.patch.1; utility has been
+	updated to include a new option to the <literal>-V</literal>
+	flag, <literal>none</literal>, which disables backup file
+	creation when applying a patch.</para>
+
+      <para revision="286010" contrib="sponsor" sponsor="&ff;">The
+	&man.ar.1; utility now enables deterministic mode
+	(<literal>-D</literal>) by default.  This behavior can be
+	disabled by specifying the <literal>-U</literal> flag.</para>
+
+      <para revision="286289" contrib="sponsor"
+	sponsor="&scaleengine;">The &man.xargs.1; utility has been
+	updated to allow specifying <literal>0</literal> as an
+	argument to the <literal>-P</literal> (parallel mode) flag,
+	which allows creating as many concurrent processes as
+	possible.</para>
+
+      <para revision="286795">The &man.patch.1; utility has been
+	updated to remove the automatic checkout feature.</para>
+
+      <para revision="287473" contrib="sponsor" sponsor="&gandi;">A
+	new utility, &man.sesutil.8;, has been added, which is used
+	to manage &man.ses.4; devices.</para>
+
+      <para revision="287522">The &man.pciconf.8; utility has been
+	updated to use the PCI ID database from the <filename
+	  role="package">misc/pciids</filename> package, if present,
+	falling back to the PCI ID database in the &os; base
+	system.</para>
+
+      <para revision="287842" contrib="sponsor"
+	sponsor="&scaleengine;">The &man.ifconfig.8; utility has been
+	updated to always exit with an error code if an important
+	&man.ioctl.2; fails.</para>
     </sect2>
 
     <sect2 xml:id="userland-contrib">
@@ -407,9 +464,6 @@
       <para revision="260445">&man.byacc.1; has been updated to
 	version 20140101.</para>
 
-      <para revision="261071">&man.jemalloc.3; has been updated to
-	version 3.5.0.</para>
-
       <para revision="261283"><application>libc++</application> has
 	been updated to version 3.4.</para>
 
@@ -471,28 +525,13 @@
 	&man.hostapd.8; utilities have been updated to version
 	2.4.</para>
 
-      <para revision="282089">The &man.unbound.8; utility has been
-	updated to version 1.5.3.</para>
-
       <para revision="282434" contrib="sponsor" sponsor="&ff;">The
 	&man.resolvconf.8; utility has been updated to version
 	3.7.0.</para>
 
-      <para revision="282613">The &man.nc.1; utility has been updated
-	to the OpenBSD 5.7 version.</para>
-
-      <para revision="283092">The &man.acpi.4; subsystem has been
-	updated to version 20150515.</para>
-
-      <para revision="284237">The &man.file.1; utility has been
-	updated to version 5.23.</para>
-
       <para revision="284254"><application>bmake</application> has
 	been updated to version 20150606.</para>
 
-      <para revision="284397">Timezone data files have been updated to
-	version 2015e.</para>
-
       <para revision="285229"><application>sendmail</application> has
 	been updated to 8.15.2.  Starting with &os;&nbsp;11.0 and
 	sendmail 8.15, sendmail uses uncompressed IPv6 addresses by
@@ -509,6 +548,9 @@
 	<literal>confUSE_COMPRESSED_IPV6_ADDRESSES</literal> or the cf
 	option <literal>UseCompressedIPv6Addresses</literal>.</para>
 
+      <para revision="285275">The &man.tcpdump.1; utility has been
+	updated to version 4.7.4.</para>
+
       <para revision="285329"><application>OpenSSL</application> has
 	been updated to version 1.0.1p.</para>
 
@@ -516,6 +558,43 @@
 	&man.ssh.1; utility has been updated to re-implement hostname
 	canonicalization before locating the host in
 	<filename>known_hosts</filename>.</para>
+
+      <para revision="285972">The &man.libarchive.3; library has been
+	updated to properly skip a sparse file entry in a &man.tar.1;
+	file, which would previously produce errors.</para>
+
+      <para revision="286503">The <application>apr</application>
+	library used by &man.svnlite.1; has been updated to version
+	1.5.2.</para>
+
+      <para revision="286505">The <application>serf</application>
+	library used by &man.svnlite.1; has been updated to version
+	1.3.8.</para>
+
+      <para revision="286505">The &man.svnlite.1; utility has been
+	updated to version 1.8.14.</para>
+
+      <para revision="286510">The <application>sqlite3</application>
+	library used by &man.svnlite.1; and &man.kerberos.8; has been
+	updated to version 3.8.11.1.</para>
+
+      <para revision="286750">Timezone data files have been updated to
+	version 2015f.</para>
+
+      <para revision="287168">The &man.acpi.4; subsystem has been
+	updated to version 20150818.</para>
+
+      <para revision="287917">The &man.unbound.8; utility has been
+	updated to version 1.5.4.</para>
+
+      <para revision="288090">&man.jemalloc.3; has been updated to
+	version 4.0.2.</para>
+
+      <para revision="288143">The &man.file.1; utility has been
+	updated to version 5.25.</para>
+
+      <para revision="288303">The &man.nc.1; utility has been updated
+	to the OpenBSD 5.8 version.</para>
     </sect2>
 
     <sect2 xml:id="userland-installer">
@@ -590,6 +669,12 @@
 	<filename>iovctl</filename>, has been added, which allows
 	automatically starting the &man.iovctl.8; utility at
 	boot.</para>
+
+      <para revision="287576" contrib="sponsor"
+	sponsor="&scaleengine;">The &man.service.8; utility has been
+	updated to honor entries within <filename
+	  class="directory">/etc/rc.conf.d/</filename>.</para>
+
     </sect2>
 
     <sect2 xml:id="userland-periodic">
@@ -695,6 +780,11 @@
       <para revision="284483" contrib="sponsor"
 	sponsor="&scaleengine;">The Blowfish &man.crypt.3; library
 	has been updated to support &dollar;2y&dollar; hashes.</para>
+
+      <para revision="285277">The &man.execl.3; and &man.execlp.3;
+	library functions have been updated to use the
+	<literal>__sentinel</literal> <application>gcc</application>
+	attribute.</para>
     </sect2>
 
     <sect2 xml:id="userland-abi">
@@ -765,6 +855,11 @@
       <para revision="281261" arch="powerpc">Support for
 	&man.dtrace.1; has been added for the
 	Book-E&nbsp;&trade;.</para>
+
+      <para revision="287886" contrib="sponsor"
+	sponsor="&multiplay;">The &man.kqueue.2; system call has been
+	updated to handle write events to files larger than 2
+	gigabytes.</para>
     </sect2>
 
     <sect2 xml:id="kernel-config">
@@ -867,6 +962,32 @@
 	<para>Multi-queue support in the &man.em.4; driver is not
 	  officially supported by &intel;.</para>
       </note>
+
+      <para revision="285142" contrib="sponsor"
+	sponsor="&netgate;">The <filename>GENERIC</filename> kernel
+	configuration has been updated to include the
+	<literal>IPSEC</literal> option by default.</para>
+
+      <para revision="285387" contrib="sponsor"
+	sponsor="&norse;, &dell;">Initial <acronym>NUMA</acronym>
+	affinity and policy configuration has been added.  See
+	&man.numactl.1;, and &man.numa.getaffinity.2;, for usage
+	details.</para>
+
+      <para revision="286231">The &man.pms.4; driver has been added
+	to the <filename>GENERIC</filename> kernel configuration for
+	supported architectures.</para>
+
+      <para revision="287306" arch="arm">The
+	<filename>CUBIEBOARD2</filename> kernel configuration has been
+	renamed to <filename>A20</filename>.</para>
+
+      <para revision="288176" contrib="sponsor" sponsor="&ff;">Kernel
+	debugging symbols are now installed to <filename
+	  class="directory">/usr/lib/debug/boot/kernel/</filename>.
+	To retain the previous behavior, add
+	<literal>KERN_DEBUGDIR=""</literal> to
+	&man.src.conf.5;.</para>
     </sect2>
 
     <sect2 xml:id="kernel-sysctl">
@@ -915,6 +1036,14 @@
 	been added, which when set to <literal>1</literal> during
 	runtime will flush all
 	<literal>net.inet.tcp.hostcache</literal> entries.</para>
+
+      <para revision="285524">A new &man.sysctl.8;,
+	<literal>hw.model</literal>, has been added, which displays
+	<acronym>CPU</acronym> model information.</para>
+
+      <para revision="286591">The &man.uart.4; driver has been
+	updated to allow tuning packets per second captured during
+	runtime.</para>
     </sect2>
   </sect1>
 
@@ -965,6 +1094,13 @@
       <para revision="282783" arch="powerpc">Support for the Freescale
 	<acronym>PCI</acronym> Root Complex device has been
 	added.</para>
+
+      <para revision="285876">The &man.cyapa.4; driver has been added,
+	supporting the Cypress APA I2C trackpad.</para>
+
+      <para revision="285883">The &man.isl.4; driver has been added,
+	supporting the Intersil I2C ISL29018 digital ambient light
+	sensor.</para>
     </sect2>
 
     <sect2 xml:id="drivers-storage">
@@ -1002,6 +1138,23 @@
 
       <para revision="281387">The &man.hptnr.4; driver has been
 	updated to version 1.1.1.</para>
+
+      <para revision="285662">The &man.pms.4; driver has been added,
+	providing support for the PMC Sierra line of
+	<acronym>SAS</acronym>/<acronym>SATA</acronym> host bus
+	adapters.</para>
+
+      <para revision="287117" contrib="sponsor"
+	sponsor="&emcisilon;">The &man.ioat.4; driver has been added,
+	providing support for the <acronym>PSE</acronym> (Platform
+	Storage Extension).</para>
+
+      <para revision="287621" contrib="sponsor" sponsor="&ix;">The
+	<acronym>CTL</acronym> High Availability implementation has
+	been rewritten.</para>
+
+      <para revision="288310">The &man.ctl.4; driver has been updated
+	to support CD-ROM and removable devices.</para>
     </sect2>
 
     <sect2 xml:id="drivers-network">
@@ -1049,8 +1202,8 @@
       <para revision="272730">The &man.alc.4; driver has been updated
 	to support AR816x and AR817x ethernet controllers.</para>
 
-      <para revision="272906">The &man.pf.4; packet filter default hash
-	has been changed from <literal>Jenkins</literal> to
+      <para revision="272906">The &man.pf.4; packet filter default
+	hash has been changed from <literal>Jenkins</literal> to
 	<literal>Murmur3</literal>, providing a 3-percent performance
 	increase in packets-per-second.</para>
 
@@ -1079,6 +1232,25 @@
 
       <para revision="284125">The &man.cdce.4; driver has been updated
 	to include support for the RTL8153 chipset.</para>
+
+      <para revision="286441">The &man.iwm.4; driver has been imported
+	from OpenBSD, providing support for &intel; 3160/7260/7265
+	wireless chipsets.</para>
+
+      <para revision="286829" contrib="sponsor"
+	sponsor="&limelight;">The &man.em.4; driver has been updated
+	to allow disabling <acronym>CRC</acronym> stripping.</para>
+
+      <para revision="287222">The &man.pf.4; implementation has been
+	updated to remove support for the <literal>scrub fragment
+	  crop|drop-ovl</literal> filtering rule.  Systems with this
+	rule in &man.pf.conf.5; will implicitly be converted to the
+	<literal>scrub fragment reassemble</literal> filtering rule,
+	without necessary intervention.</para>
+
+      <para revision="287469" contrib="sponsor"
+	sponsor="&intelcorp;">The &man.em.4; driver has been updated
+	to support the Skylake I219 chipset.</para>
     </sect2>
   </sect1>
 
@@ -1131,6 +1303,10 @@
 
       <para>The &man.uart.4; driver has been updated to support
 	<acronym>AMT</acronym> devices on newer systems.</para>
+
+      <para revision="285316" contrib="sponsor" sponsor="&ff;"
+	arch="arm64">Initial <acronym>SMP</acronym> support has been
+	added to the &os;/&arch.arm64; port.</para>
     </sect2>
 
     <sect2 xml:id="hardware-virtualization">
@@ -1217,6 +1393,10 @@
       <para revision="284746" contrib="sponsor" sponsor="&msostc;">The
 	&man.hv.netvsc.4; driver has been updated to support checksum
 	offloading and <acronym>TSO</acronym>.</para>
+
+      <para revision="286062">The &man.xen.4; driver has been updated
+	to include support for <literal>blkif</literal> indirect
+	segment I/O.</para>
     </sect2>
 
     <sect2 xml:id="hardware-arm">
@@ -1269,6 +1449,15 @@
 	sponsor="&ff;">Initial
 	<acronym>ACPI</acronym> support has been added for
 	&os;/&arch.arm64;.</para>
+
+      <para revision="287225">Support for 1-Wire devices has been
+	added, providing support for 1-Wire hardware through
+	&man.gpio.4;.  See &man.ow.4;, &man.owc.4;, and
+	&man.ow.temp.4; for more information.</para>
+
+      <para revision="287371" arch="arm64" contrib="sponsor"
+	sponsor="&abt;">Support for the HiSilicon HI6220 SoC has been
+	added.</para>
     </sect2>
   </sect1>
 
@@ -1302,6 +1491,13 @@
 	&man.auto.master.5; map, <literal>-noauto</literal>, which
 	handles &man.fstab.5; entries set to
 	<literal>noauto</literal>.</para>
+
+      <para revision="286444">The <acronym>GELI</acronym> class has
+	been updated to support the <literal>BIO_DELETE</literal>
+	&man.g.bio.9; <literal>bio_cmd</literal> field, providing
+	<acronym>TRIM</acronym>/<acronym>UNMAP</acronym> support on
+	<acronym>GELI</acronym>-backed <acronym>SSD</acronym> storage
+	providers.</para>
     </sect2>
 
     <sect2 xml:id="storage-net">
@@ -1333,6 +1529,12 @@
 	&man.sysctl.8; has been removed, and replaced with the
 	<literal>kstat.zfs.misc.arcstats.arc_meta_used</literal>
 	&man.sysctl.8;.</para>
+
+      <para revision="287099" contrib="sponsor"
+	sponsor="&clusterhq;">The &man.zfs.8; <literal>l2arc</literal>
+	code has been updated to take <literal>ashift</literal> into
+	account when gathering buffers to be written to the
+	<literal>l2arc</literal> device.</para>
     </sect2>
 
     <sect2 xml:id="storage-geom">
@@ -1346,6 +1548,13 @@
 	<literal>apple-boot</literal>, <literal>apple-hfs</literal>,
 	and <literal>apple-ufs</literal> <acronym>MBR</acronym>
 	partitioning schemes have been added to &man.gpart.8;.</para>
+
+      <para revision="285594" contrib="sponsor"
+	sponsor="&scaleengine;">The &man.gpart.8; utility has been
+	updated to include a new attribute for <acronym>GPT</acronym>
+	partitions, <literal>lenovofix</literal>, which when set,
+	which works around <acronym>BIOS</acronym> compatibility
+	issues reported on several Lenovo&nbsp;&trade; laptops.</para>
     </sect2>
   </sect1>
 
@@ -1491,6 +1700,16 @@
 	6864) has been added.  Support for this feature can be toggled
 	with the <literal>net.inet.ip.rfc6864</literal>
 	&man.sysctl.8;, which is enabled by default.</para>
+
+      <para revision="285336" contrib="sponsor"
+	sponsor="&netgate;">The <acronym>IPSEC</acronym> has been
+	updated to include support for <acronym>AES</acronym> modes on
+	both software-only and hardware-backed (&man.aesni.4;)
+	systems.</para>
+
+      <para revision="287798" contrib="sponsor" sponsor="&dell;">The
+	network stack has been updated to fix handling of
+	<acronym>IPv6</acronym> On-Link redirects.</para>
     </sect2>
   </sect1>
 

Modified: projects/clang370-import/release/doc/share/xml/sponsor.ent
==============================================================================
--- projects/clang370-import/release/doc/share/xml/sponsor.ent	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/release/doc/share/xml/sponsor.ent	Tue Oct  6 16:25:13 2015	(r288926)
@@ -8,6 +8,7 @@
 
 -->
 
+<!ENTITY abt		"ABT Systems, Ltd.">
 <!ENTITY afrl		"AFRL">
 
 <!ENTITY chelsio	"Chelsio Communications">
@@ -21,9 +22,12 @@
 <!ENTITY darpa_afrl	"DARPA, AFRL">
 <!ENTITY dell		"Dell, Inc.">
 
+<!ENTITY emcisilon	"EMC / Isilon Storage Division">
+
 <!ENTITY ff		"The&nbsp;&os;&nbsp;Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">;
 
+<!ENTITY gandi		"Gandi.net">
 <!ENTITY google		"Google">
 
 <!ENTITY juniper	"Juniper Networks, Inc.">
@@ -41,6 +45,7 @@
 <!ENTITY netflix	"Netflix">
 <!ENTITY netgate	"Netgate">
 <!ENTITY nginx		"Nginx, Inc.">
+<!ENTITY norse		"Norse Corporation">
 
 <!ENTITY sandvine	"Sandvine, Inc.">
 <!ENTITY scaleengine	"ScaleEngine, Inc.">

Modified: projects/clang370-import/share/mk/bsd.own.mk
==============================================================================
--- projects/clang370-import/share/mk/bsd.own.mk	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/share/mk/bsd.own.mk	Tue Oct  6 16:25:13 2015	(r288926)
@@ -246,7 +246,10 @@ XZ_CMD?=	xz
 # overriden by Makefiles, but the user may choose to set this in src.conf(5).
 TESTSBASE?= /usr/tests
 
-# Compat for the moment
+# Compat for the moment -- old bsd.own.mk only included this when _WITHOUT_SRCCONF
+# wasn't defined. bsd.ports.mk and friends depend on this behavior. Remove in 12.
+.if !defined(_WITHOUT_SRCCONF)
 .include <bsd.compiler.mk>
+.endif # !_WITHOUT_SRCCONF
 
 .endif	# !target(__<bsd.own.mk>__)

Modified: projects/clang370-import/sys/amd64/amd64/support.S
==============================================================================
--- projects/clang370-import/sys/amd64/amd64/support.S	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/amd64/amd64/support.S	Tue Oct  6 16:25:13 2015	(r288926)
@@ -33,7 +33,6 @@
 #include "opt_ddb.h"
 
 #include <machine/asmacros.h>
-#include <machine/intr_machdep.h>
 #include <machine/pmap.h>
 
 #include "assym.s"

Modified: projects/clang370-import/sys/amd64/include/intr_machdep.h
==============================================================================
--- projects/clang370-import/sys/amd64/include/intr_machdep.h	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/amd64/include/intr_machdep.h	Tue Oct  6 16:25:13 2015	(r288926)
@@ -53,6 +53,7 @@
 #define	FIRST_MSI_INT	256
 #ifdef XENHVM
 #include <xen/xen-os.h>
+#include <xen/interface/event_channel.h>
 #define	NUM_EVTCHN_INTS	NR_EVENT_CHANNELS
 #define	FIRST_EVTCHN_INT \
     (FIRST_MSI_INT + NUM_MSI_INTS)

Modified: projects/clang370-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- projects/clang370-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Tue Oct  6 16:25:13 2015	(r288926)
@@ -1104,6 +1104,22 @@ ipf_checkv4sum(fin)
 		return -1;
 	}
 	if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) {
+		/* Depending on the driver, UDP may have zero checksum */
+		if (fin->fin_p == IPPROTO_UDP && (fin->fin_flx &
+		    (FI_FRAG|FI_SHORT|FI_BAD)) == 0) {
+			udphdr_t *udp = fin->fin_dp;
+			if (udp->uh_sum == 0) {
+				/*
+				 * we're good no matter what the hardware
+				 * checksum flags and csum_data say (handling
+				 * of csum_data for zero UDP checksum is not
+				 * consistent across all drivers)
+				 */
+				fin->fin_cksum = 1;
+				return 0;
+			}
+		}
+
 		if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
 			sum = m->m_pkthdr.csum_data;
 		else

Modified: projects/clang370-import/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- projects/clang370-import/sys/dev/xen/blkfront/blkfront.c	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/dev/xen/blkfront/blkfront.c	Tue Oct  6 16:25:13 2015	(r288926)
@@ -162,7 +162,7 @@ xbd_free_command(struct xbd_command *cm)
 static void
 xbd_mksegarray(bus_dma_segment_t *segs, int nsegs,
     grant_ref_t * gref_head, int otherend_id, int readonly,
-    grant_ref_t * sg_ref, blkif_request_segment_t * sg)
+    grant_ref_t * sg_ref, struct blkif_request_segment *sg)
 {
 	struct blkif_request_segment *last_block_sg = sg + nsegs;
 	vm_paddr_t buffer_ma;

Modified: projects/clang370-import/sys/i386/i386/support.s
==============================================================================
--- projects/clang370-import/sys/i386/i386/support.s	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/i386/i386/support.s	Tue Oct  6 16:25:13 2015	(r288926)
@@ -33,7 +33,6 @@
 
 #include <machine/asmacros.h>
 #include <machine/cputypes.h>
-#include <machine/intr_machdep.h>
 #include <machine/pmap.h>
 #include <machine/specialreg.h>
 

Modified: projects/clang370-import/sys/i386/include/intr_machdep.h
==============================================================================
--- projects/clang370-import/sys/i386/include/intr_machdep.h	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/i386/include/intr_machdep.h	Tue Oct  6 16:25:13 2015	(r288926)
@@ -53,6 +53,7 @@
 #define	FIRST_MSI_INT	256
 #ifdef XENHVM
 #include <xen/xen-os.h>
+#include <xen/interface/event_channel.h>
 #define	NUM_EVTCHN_INTS	NR_EVENT_CHANNELS
 #define	FIRST_EVTCHN_INT \
     (FIRST_MSI_INT + NUM_MSI_INTS)

Modified: projects/clang370-import/sys/kern/sys_process.c
==============================================================================
--- projects/clang370-import/sys/kern/sys_process.c	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/kern/sys_process.c	Tue Oct  6 16:25:13 2015	(r288926)
@@ -928,25 +928,29 @@ kern_ptrace(struct thread *td, int req, 
 			switch (req) {
 			case PT_TO_SCE:
 				p->p_stops |= S_PT_SCE;
-				CTR2(KTR_PTRACE,
-				    "PT_TO_SCE: pid %d, stops = %#x", p->p_pid,
-				    p->p_stops);
+				CTR4(KTR_PTRACE,
+		    "PT_TO_SCE: pid %d, stops = %#x, PC = %#lx, sig = %d",
+				    p->p_pid, p->p_stops,
+				    (u_long)(uintfptr_t)addr, data);
 				break;
 			case PT_TO_SCX:
 				p->p_stops |= S_PT_SCX;
-				CTR2(KTR_PTRACE,
-				    "PT_TO_SCX: pid %d, stops = %#x", p->p_pid,
-				    p->p_stops);
+				CTR4(KTR_PTRACE,
+		    "PT_TO_SCX: pid %d, stops = %#x, PC = %#lx, sig = %d",
+				    p->p_pid, p->p_stops,
+				    (u_long)(uintfptr_t)addr, data);
 				break;
 			case PT_SYSCALL:
 				p->p_stops |= S_PT_SCE | S_PT_SCX;
-				CTR2(KTR_PTRACE,
-				    "PT_SYSCALL: pid %d, stops = %#x", p->p_pid,
-				    p->p_stops);
+				CTR4(KTR_PTRACE,
+		    "PT_SYSCALL: pid %d, stops = %#x, PC = %#lx, sig = %d",
+				    p->p_pid, p->p_stops,
+				    (u_long)(uintfptr_t)addr, data);
 				break;
 			case PT_CONTINUE:
-				CTR1(KTR_PTRACE,
-				    "PT_CONTINUE: pid %d", p->p_pid);
+				CTR3(KTR_PTRACE,
+				    "PT_CONTINUE: pid %d, PC = %#lx, sig = %d",
+				    p->p_pid, (u_long)(uintfptr_t)addr, data);
 				break;
 			}
 			break;
@@ -969,11 +973,12 @@ kern_ptrace(struct thread *td, int req, 
 				proc_reparent(p, pp);
 				if (pp == initproc)
 					p->p_sigparent = SIGCHLD;
-				CTR2(KTR_PTRACE,
-				    "PT_DETACH: pid %d reparented to pid %d",
-				    p->p_pid, pp->p_pid);
+				CTR3(KTR_PTRACE,
+			    "PT_DETACH: pid %d reparented to pid %d, sig %d",
+				    p->p_pid, pp->p_pid, data);
 			} else
-				CTR1(KTR_PTRACE, "PT_DETACH: pid %d", p->p_pid);
+				CTR2(KTR_PTRACE, "PT_DETACH: pid %d, sig %d",
+				    p->p_pid, data);
 			p->p_oppid = 0;
 			p->p_stops = 0;
 
@@ -1226,10 +1231,10 @@ kern_ptrace(struct thread *td, int req, 
 		if (wrap32)
 			ptrace_lwpinfo_to32(pl, pl32);
 #endif
-		CTR5(KTR_PTRACE,
-	    "PT_LWPINFO: tid %d (pid %d) event %d flags %#x child pid %d",
+		CTR6(KTR_PTRACE,
+    "PT_LWPINFO: tid %d (pid %d) event %d flags %#x child pid %d syscall %d",
 		    td2->td_tid, p->p_pid, pl->pl_event, pl->pl_flags,
-		    pl->pl_child_pid);
+		    pl->pl_child_pid, pl->pl_syscall_code);
 		break;
 
 	case PT_GETNUMLWPS:

Modified: projects/clang370-import/sys/kern/uipc_mbuf.c
==============================================================================
--- projects/clang370-import/sys/kern/uipc_mbuf.c	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/kern/uipc_mbuf.c	Tue Oct  6 16:25:13 2015	(r288926)
@@ -1034,8 +1034,6 @@ bad:
  * the amount of empty space before the data in the new mbuf to be specified
  * (in the event that the caller expects to prepend later).
  */
-int MSFail;
-
 struct mbuf *
 m_copyup(struct mbuf *n, int len, int dstoff)
 {
@@ -1072,7 +1070,6 @@ m_copyup(struct mbuf *n, int len, int ds
 	return (m);
  bad:
 	m_freem(n);
-	MSFail++;
 	return (NULL);
 }
 

Modified: projects/clang370-import/sys/netinet/tcp_input.c
==============================================================================
--- projects/clang370-import/sys/netinet/tcp_input.c	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/netinet/tcp_input.c	Tue Oct  6 16:25:13 2015	(r288926)
@@ -2536,6 +2536,16 @@ tcp_do_segment(struct mbuf *m, struct tc
 						tp->snd_nxt = onxt;
 					goto drop;
 				} else if (V_tcp_do_rfc3042) {
+					/*
+					 * Process first and second duplicate
+					 * ACKs. Each indicates a segment
+					 * leaving the network, creating room
+					 * for more. Make sure we can send a
+					 * packet on reception of each duplicate
+					 * ACK by increasing snd_cwnd by one
+					 * segment. Restore the original
+					 * snd_cwnd after packet transmission.
+					 */
 					cc_ack_received(tp, th, CC_DUPACK);
 					u_long oldcwnd = tp->snd_cwnd;
 					tcp_seq oldsndmax = tp->snd_max;

Modified: projects/clang370-import/sys/powerpc/powerpc/swtch32.S
==============================================================================
--- projects/clang370-import/sys/powerpc/powerpc/swtch32.S	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/powerpc/powerpc/swtch32.S	Tue Oct  6 16:25:13 2015	(r288926)
@@ -187,6 +187,8 @@ ENTRY(savectx)
 	stmw	%r12,PCB_CONTEXT(%r3)	/* Save the non-volatile GP regs */
 	mfcr	%r4			/* Save the condition register */
 	stw	%r4,PCB_CR(%r3)
+	mflr	%r4			/* Save the link register */
+	stw	%r4,PCB_LR(%r3)
 	blr
 
 /*

Modified: projects/clang370-import/sys/powerpc/powerpc/swtch64.S
==============================================================================
--- projects/clang370-import/sys/powerpc/powerpc/swtch64.S	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/powerpc/powerpc/swtch64.S	Tue Oct  6 16:25:13 2015	(r288926)
@@ -255,6 +255,8 @@ ENTRY(savectx)
 	mfcr	%r4			/* Save the condition register */
 	std	%r4,PCB_CR(%r3)
 	std	%r2,PCB_TOC(%r3)	/* Save the TOC pointer */
+	mflr	%r4			/* Save the link register */
+	std	%r4,PCB_LR(%r3)
 	blr
 
 /*

Modified: projects/clang370-import/sys/vm/swap_pager.c
==============================================================================
--- projects/clang370-import/sys/vm/swap_pager.c	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/vm/swap_pager.c	Tue Oct  6 16:25:13 2015	(r288926)
@@ -313,8 +313,6 @@ swap_release_by_cred(vm_ooffset_t decr, 
 	racct_sub_cred(cred, RACCT_SWAP, decr);
 }
 
-static void swapdev_strategy(struct buf *, struct swdevt *sw);
-
 #define SWM_FREE	0x02	/* free, period			*/
 #define SWM_POP		0x04	/* pop out			*/
 
@@ -1308,7 +1306,7 @@ swap_pager_getpages_async(vm_object_t ob
  *	those whos rtvals[] entry is not set to VM_PAGER_PEND on return.
  *	We need to unbusy the rest on I/O completion.
  */
-void
+static void
 swap_pager_putpages(vm_object_t object, vm_page_t *m, int count,
     int flags, int *rtvals)
 {

Modified: projects/clang370-import/sys/vm/vm_kern.c
==============================================================================
--- projects/clang370-import/sys/vm/vm_kern.c	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/vm/vm_kern.c	Tue Oct  6 16:25:13 2015	(r288926)
@@ -386,7 +386,7 @@ kmem_unback(vm_object_t object, vm_offse
 	VM_OBJECT_WLOCK(object);
 	for (i = 0; i < size; i += PAGE_SIZE) {
 		m = vm_page_lookup(object, OFF_TO_IDX(offset + i));
-		vm_page_unwire(m, PQ_INACTIVE);
+		vm_page_unwire(m, PQ_NONE);
 		vm_page_free(m);
 	}
 	VM_OBJECT_WUNLOCK(object);

Modified: projects/clang370-import/sys/xen/interface/arch-arm.h
==============================================================================
--- projects/clang370-import/sys/xen/interface/arch-arm.h	Tue Oct  6 15:30:48 2015	(r288925)
+++ projects/clang370-import/sys/xen/interface/arch-arm.h	Tue Oct  6 16:25:13 2015	(r288926)
@@ -27,93 +27,253 @@
 #ifndef __XEN_PUBLIC_ARCH_ARM_H__
 #define __XEN_PUBLIC_ARCH_ARM_H__
 
-/* hypercall calling convention
- * ----------------------------
+/*
+ * `incontents 50 arm_abi Hypercall Calling Convention
  *
  * A hypercall is issued using the ARM HVC instruction.
  *
  * A hypercall can take up to 5 arguments. These are passed in
- * registers, the first argument in r0, the second argument in r1, the
- * third in r2, the forth in r3 and the fifth in r4.
+ * registers, the first argument in x0/r0 (for arm64/arm32 guests
+ * respectively irrespective of whether the underlying hypervisor is
+ * 32- or 64-bit), the second argument in x1/r1, the third in x2/r2,
+ * the forth in x3/r3 and the fifth in x4/r4.
  *
- * The hypercall number is passed in r12.
+ * The hypercall number is passed in r12 (arm) or x16 (arm64). In both
+ * cases the relevant ARM procedure calling convention specifies this
+ * is an inter-procedure-call scratch register (e.g. for use in linker
+ * stubs). This use does not conflict with use during a hypercall.
  *
  * The HVC ISS must contain a Xen specific TAG: XEN_HYPERCALL_TAG.
  *
- * The return value is in r0.
+ * The return value is in x0/r0.
+ *
+ * The hypercall will clobber x16/r12 and the argument registers used
+ * by that hypercall (except r0 which is the return value) i.e. in
+ * addition to x16/r12 a 2 argument hypercall will clobber x1/r1 and a
+ * 4 argument hypercall will clobber x1/r1, x2/r2 and x3/r3.
+ *
+ * Parameter structs passed to hypercalls are laid out according to
+ * the Procedure Call Standard for the ARM Architecture (AAPCS, AKA
+ * EABI) and Procedure Call Standard for the ARM 64-bit Architecture
+ * (AAPCS64). Where there is a conflict the 64-bit standard should be
+ * used regardless of guest type. Structures which are passed as
+ * hypercall arguments are always little endian.
+ *
+ * All memory which is shared with other entities in the system
+ * (including the hypervisor and other guests) must reside in memory
+ * which is mapped as Normal Inner-cacheable. This applies to:
+ *  - hypercall arguments passed via a pointer to guest memory.
+ *  - memory shared via the grant table mechanism (including PV I/O
+ *    rings etc).
+ *  - memory shared with the hypervisor (struct shared_info, struct
+ *    vcpu_info, the grant table, etc).
+ *
+ * Any Inner cache allocation strategy (Write-Back, Write-Through etc)
+ * is acceptable. There is no restriction on the Outer-cacheability.
+ */
+
+/*
+ * `incontents 55 arm_hcall Supported Hypercalls
+ *
+ * Xen on ARM makes extensive use of hardware facilities and therefore
+ * only a subset of the potential hypercalls are required.
+ *
+ * Since ARM uses second stage paging any machine/physical addresses
+ * passed to hypercalls are Guest Physical Addresses (Intermediate
+ * Physical Addresses) unless otherwise noted.
+ *
+ * The following hypercalls (and sub operations) are supported on the
+ * ARM platform. Other hypercalls should be considered
+ * unavailable/unsupported.
+ *
+ *  HYPERVISOR_memory_op
+ *   All generic sub-operations
+ *
+ *  HYPERVISOR_domctl
+ *   All generic sub-operations, with the exception of:
+ *    * XEN_DOMCTL_irq_permission (not yet implemented)
+ *
+ *  HYPERVISOR_sched_op
+ *   All generic sub-operations, with the exception of:
+ *    * SCHEDOP_block -- prefer wfi hardware instruction
+ *
+ *  HYPERVISOR_console_io
+ *   All generic sub-operations
+ *
+ *  HYPERVISOR_xen_version
+ *   All generic sub-operations
+ *
+ *  HYPERVISOR_event_channel_op
+ *   All generic sub-operations
+ *
+ *  HYPERVISOR_physdev_op
+ *   No sub-operations are currenty supported
+ *
+ *  HYPERVISOR_sysctl
+ *   All generic sub-operations, with the exception of:
+ *    * XEN_SYSCTL_page_offline_op
+ *    * XEN_SYSCTL_get_pmstat
+ *    * XEN_SYSCTL_pm_op
+ *
+ *  HYPERVISOR_hvm_op
+ *   Exactly these sub-operations are supported:
+ *    * HVMOP_set_param
+ *    * HVMOP_get_param
+ *
+ *  HYPERVISOR_grant_table_op
+ *   All generic sub-operations
+ *
+ *  HYPERVISOR_vcpu_op
+ *   Exactly these sub-operations are supported:
+ *    * VCPUOP_register_vcpu_info
+ *    * VCPUOP_register_runstate_memory_area
  *
- * The hypercall will clobber r12 and the argument registers used by
- * that hypercall (except r0 which is the return value) i.e. a 2
- * argument hypercall will clobber r1 and a 4 argument hypercall will
- * clobber r1, r2 and r3.
  *
+ * Other notes on the ARM ABI:
+ *
+ * - struct start_info is not exported to ARM guests.
+ *
+ * - struct shared_info is mapped by ARM guests using the
+ *   HYPERVISOR_memory_op sub-op XENMEM_add_to_physmap, passing
+ *   XENMAPSPACE_shared_info as space parameter.
+ *
+ * - All the per-cpu struct vcpu_info are mapped by ARM guests using the

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510061625.t96GPEhS045625>