[Glibc-bsd-commits] r5300 - in trunk/kfreebsd-11/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-03 13:48:29 +0000 (Fri, 03 Jan 2014)
New Revision: 5300

Added:
   trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff
Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/series
Log:
  * New upstream snapshot.
    - vmx_ftbfs.diff: Fix FTBFS in VMX code.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2014-01-03 12:54:29 UTC (rev 5299)
+++ trunk/kfreebsd-11/debian/changelog	2014-01-03 13:48:29 UTC (rev 5300)
@@ -1,10 +1,13 @@
-kfreebsd-11 (11.0~svn259528-3) UNRELEASED; urgency=low
+kfreebsd-11 (11.0~svn260207-1) experimental; urgency=low
 
+  * New upstream snapshot.
+    - vmx_ftbfs.diff: Fix FTBFS in VMX code.
+
   * Only assert linker.hints presence on kfreebsd-any.
   * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
   * Switch to bmake to follow upstream.
 
- -- Robert Millan <rmh at debian.org>  Thu, 02 Jan 2014 23:25:01 +0100
+ -- Robert Millan <rmh at debian.org>  Fri, 03 Jan 2014 13:54:51 +0100
 
 kfreebsd-11 (11.0~svn259528-2) experimental; urgency=low
 

Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series	2014-01-03 12:54:29 UTC (rev 5299)
+++ trunk/kfreebsd-11/debian/patches/series	2014-01-03 13:48:29 UTC (rev 5300)
@@ -4,6 +4,7 @@
 mount_remount.diff
 ldscript_output_format.diff
 unescaped_kern_ident.diff
+vmx_ftbfs.diff
 
 # Other patches that might or might not be mergeable
 userland.diff

Added: trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff	                        (rev 0)
+++ trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff	2014-01-03 13:48:29 UTC (rev 5300)
@@ -0,0 +1,11 @@
+--- a/sys/amd64/vmm/intel/vmx_support.S
++++ b/sys/amd64/vmm/intel/vmx_support.S
+@@ -187,7 +187,7 @@
+ 
+ 	VMX_HOST_RESTORE(%r10)
+ 	ret
+-END(vmx_execute_guest)
++END(vmx_enter_guest)
+ 
+ /*
+  * void vmx_exit_guest(void)