Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Jan 2013 14:42:59 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 221299 for review
Message-ID:  <201301201442.r0KEgxOQ028447@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@221299?ac=10

Change 221299 by jhb@jhb_ralph on 2013/01/20 14:42:11

	IFC @221297

Affected files ...

.. //depot/projects/smpng/sys/amd64/include/vmm.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/vmm_dev.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/amd/amdv.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/ept.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/ept.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_controls.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_cpufunc.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_genassym.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_msr.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_msr.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_support.S#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vtd.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/iommu.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/iommu.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/ppt.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/ppt.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vdev.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vdev.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_dev.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_ipi.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_ipi.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_ktr.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_lapic.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_lapic.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_mem.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_mem.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_msr.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_msr.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_stat.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_stat.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_support.S#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_util.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_util.h#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/x86.c#2 integrate
.. //depot/projects/smpng/sys/amd64/vmm/x86.h#2 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_scm.c#4 integrate
.. //depot/projects/smpng/sys/boot/arm/uboot/Makefile#9 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/beaglebone.dts#3 integrate
.. //depot/projects/smpng/sys/conf/Makefile.arm#41 integrate
.. //depot/projects/smpng/sys/conf/ldscript.arm#6 integrate
.. //depot/projects/smpng/sys/dev/blackhole/blackhole.c#2 integrate
.. //depot/projects/smpng/sys/dev/bvm/bvm_console.c#2 integrate
.. //depot/projects/smpng/sys/dev/bvm/bvm_dbg.c#2 integrate
.. //depot/projects/smpng/sys/modules/blackhole/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/vmm/Makefile#2 integrate

Differences ...

==== //depot/projects/smpng/sys/amd64/include/vmm.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: vmm.h 482 2011-05-09 21:22:43Z grehan $
+ * $FreeBSD: head/sys/amd64/include/vmm.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMM_H_

==== //depot/projects/smpng/sys/amd64/include/vmm_dev.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: vmm_dev.h 482 2011-05-09 21:22:43Z grehan $
+ * $FreeBSD: head/sys/amd64/include/vmm_dev.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef	_VMM_DEV_H_

==== //depot/projects/smpng/sys/amd64/vmm/amd/amdv.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/amd/amdv.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/amd/amdv.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/intel/ept.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/types.h>
 #include <sys/errno.h>

==== //depot/projects/smpng/sys/amd64/vmm/intel/ept.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/ept.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef	_EPT_H_

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.c#2 (text+ko) ====

@@ -23,13 +23,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMCS_H_

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMX_H_

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_controls.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx_controls.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMX_CONTROLS_H_

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_cpufunc.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx_cpufunc.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef	_VMX_CPUFUNC_H_

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_genassym.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx_genassym.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx_genassym.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_msr.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx_msr.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx_msr.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_msr.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx_msr.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMX_MSR_H_

==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_support.S#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx_support.S 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <machine/asmacros.h>

==== //depot/projects/smpng/sys/amd64/vmm/intel/vtd.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/intel/vtd.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vtd.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/amd64/vmm/io/iommu.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/iommu.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/iommu.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/types.h>

==== //depot/projects/smpng/sys/amd64/vmm/io/iommu.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/iommu.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _IO_IOMMU_H_

==== //depot/projects/smpng/sys/amd64/vmm/io/ppt.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/ppt.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/ppt.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/io/ppt.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/ppt.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _IO_PPT_H_

==== //depot/projects/smpng/sys/amd64/vmm/io/vdev.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/vdev.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vdev.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/amd64/vmm/io/vdev.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/vdev.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VDEV_H_

==== //depot/projects/smpng/sys/amd64/vmm/io/vlapic.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/vlapic.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vlapic.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/amd64/vmm/io/vlapic.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/io/vlapic.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VLAPIC_H_

==== //depot/projects/smpng/sys/amd64/vmm/vmm.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_dev.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_dev.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_dev.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_ipi.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_ipi.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_ipi.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_ipi.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_ipi.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMM_IPI_H_

==== //depot/projects/smpng/sys/amd64/vmm/vmm_ktr.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_ktr.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMM_KTR_H_

==== //depot/projects/smpng/sys/amd64/vmm/vmm_lapic.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_lapic.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_lapic.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_lapic.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_lapic.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMM_LAPIC_H_

==== //depot/projects/smpng/sys/amd64/vmm/vmm_mem.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_mem.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_mem.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/lock.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_mem.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_mem.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef	_VMM_MEM_H_

==== //depot/projects/smpng/sys/amd64/vmm/vmm_msr.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_msr.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_msr.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_msr.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_msr.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef	_VMM_MSR_H_

==== //depot/projects/smpng/sys/amd64/vmm/vmm_stat.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_stat.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_stat.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_stat.h#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_stat.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMM_STAT_H_

==== //depot/projects/smpng/sys/amd64/vmm/vmm_support.S#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_support.S 245678 2013-01-20 03:42:49Z neel $
  */
 
 #define	LOCORE

==== //depot/projects/smpng/sys/amd64/vmm/vmm_util.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_util.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_util.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>

==== //depot/projects/smpng/sys/amd64/vmm/vmm_util.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/vmm_util.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _VMM_UTIL_H_

==== //depot/projects/smpng/sys/amd64/vmm/x86.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/x86.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/x86.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/types.h>

==== //depot/projects/smpng/sys/amd64/vmm/x86.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/amd64/vmm/x86.h 245678 2013-01-20 03:42:49Z neel $
  */
 
 #ifndef _X86_H_

==== //depot/projects/smpng/sys/arm/ti/ti_scm.c#4 (text+ko) ====

@@ -46,7 +46,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/ti/ti_scm.c 240518 2012-09-14 21:28:56Z eadler $");
+__FBSDID("$FreeBSD: head/sys/arm/ti/ti_scm.c 245672 2013-01-19 17:12:23Z kientzle $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -155,8 +155,10 @@
 	}
 
 	/* couldn't find the mux mode */
-	if (mode >= 8)
+	if (mode >= 8) {
+		printf("Invalid mode \"%s\"\n", muxmode);
 		return (EINVAL);
+	}
 
 	/* set the mux mode */
 	reg_val |= (uint16_t)(mode & ti_scm_dev.padconf_muxmode_mask);
@@ -391,13 +393,16 @@
 				while (padstates->state != NULL) {
 					if (strcmp(padstates->state, padstate) == 0) {
 						err = ti_scm_padconf_set_internal(sc,
-							padconf, muxname, padstates->reg);
+						    padconf, muxname, padstates->reg);
 					}
 					padstates++;
 				}
 				if (err)
-					device_printf(sc->sc_dev, "err: failed to configure"
-						"pin \"%s\"\n", padconf->ballname);
+					device_printf(sc->sc_dev,
+					    "err: failed to configure "
+					    "pin \"%s\" as \"%s\"\n",
+					    padconf->ballname,
+					    muxname);
 			}
 			padconf++;
 		}

==== //depot/projects/smpng/sys/boot/arm/uboot/Makefile#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/arm/uboot/Makefile 244278 2012-12-15 21:47:05Z andrew $
+# $FreeBSD: head/sys/boot/arm/uboot/Makefile 245677 2013-01-19 22:12:57Z andrew $
 
 .include <bsd.own.mk>
 
@@ -112,8 +112,8 @@
 # clang doesn't understand %D as a specifier to printf
 NO_WERROR.clang=
 
-DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
-LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
+DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} ${LIBGCC}
+LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand -lgcc
 
 vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}

==== //depot/projects/smpng/sys/boot/fdt/dts/beaglebone.dts#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD: head/sys/boot/fdt/dts/beaglebone.dts 239281 2012-08-15 06:31:32Z gonzo $
+ * $FreeBSD: head/sys/boot/fdt/dts/beaglebone.dts 245673 2013-01-19 17:22:12Z kientzle $
  */
 
 /dts-v1/;
@@ -125,7 +125,7 @@
 				0x4804C000 0x1000
 				0x481AC000 0x1000
 				0x481AE000 0x1000 >;
-			interrupts = < 17 19 21 23 >;
+			interrupts = < 96 97 98 99 32 33 62 63 >;
 			interrupt-parent = <&AINTC>;
 		};
 

==== //depot/projects/smpng/sys/conf/Makefile.arm#41 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: head/sys/conf/Makefile.arm 243664 2012-11-29 03:48:39Z marcel $
+# $FreeBSD: head/sys/conf/Makefile.arm 245675 2013-01-19 22:08:16Z andrew $
 #
 # Makefile for FreeBSD
 #
@@ -41,6 +41,8 @@
 
 .if empty(DDB_ENABLED)
 CFLAGS += -mno-apcs-frame
+.elif defined(WITH_ARM_EABI)
+CFLAGS += -funwind-tables
 .endif
 
 SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \

==== //depot/projects/smpng/sys/conf/ldscript.arm#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/conf/ldscript.arm 239547 2012-08-21 23:44:47Z gonzo $ */
+/* $FreeBSD: head/sys/conf/ldscript.arm 245675 2013-01-19 22:08:16Z andrew $ */
 OUTPUT_ARCH(arm)
 ENTRY(_start)
 
@@ -56,6 +56,18 @@
   .init          : { *(.init)	} =0x9090
   .plt      : { *(.plt)	}
 
+  _extab_start = .;
+  PROVIDE(extab_start = .);
+  .ARM.extab : { *(.ARM.extab) }
+  _extab.end = .;
+  PROVIDE(extab_end = .);
+
+  _exidx_start = .;
+  PROVIDE(exidx_start = .);
+  .ARM.exidx : { *(.ARM.exidx) }
+  _exidx_end = .;
+  PROVIDE(exidx_end = .);
+
   /* Adjust the address for the data segment.  We want to adjust up to
      the same address within the page on the next page up.  */
   . = ALIGN(0x1000) + (. & (0x1000 - 1)) ; 

==== //depot/projects/smpng/sys/dev/blackhole/blackhole.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/blackhole/blackhole.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/blackhole/blackhole.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/dev/bvm/bvm_console.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/bvm/bvm_console.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/bvm/bvm_console.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/dev/bvm/bvm_dbg.c#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/bvm/bvm_dbg.c 245678 2013-01-20 03:42:49Z neel $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/bvm/bvm_dbg.c 245678 2013-01-20 03:42:49Z neel $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/smpng/sys/modules/blackhole/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/blackhole/Makefile 245678 2013-01-20 03:42:49Z neel $
 
 .PATH: ${.CURDIR}/../../dev/blackhole
 

==== //depot/projects/smpng/sys/modules/vmm/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/vmm/Makefile 245678 2013-01-20 03:42:49Z neel $
 
 KMOD=	vmm
 



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