[Glibc-bsd-commits] r5477 - in trunk/kfreebsd-10/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-05-20 13:11:31 +0000 (Tue, 20 May 2014)
New Revision: 5477

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/EN-14_05.ciss.patch
Log:
Use upstream's backport of EN-14_05.ciss for 10.0, instead of from 10-STABLE


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2014-05-20 12:24:40 UTC (rev 5476)
+++ trunk/kfreebsd-10/debian/changelog	2014-05-20 13:11:31 UTC (rev 5477)
@@ -1,11 +1,11 @@
 kfreebsd-10 (10.0-6) UNRELEASED; urgency=high
 
   * Team upload.
-  * Pick SVN 264510 from FreeBSD 10-STABLE to fix EN-14:05:
+  * Pick SVN 265987 from FreeBSD 10.0-RELEASE to fix EN-14:05:
     ciss(4) potential data corruption bug (Closes: #748079)
   * Pick SVN 266464 from FreeBSD CURRENT to fix EN-14:06:
     Triple fault on execve from 64-bit thread to 32-bit process
-    (Closes: #748744)
+    (Closes: Bug#748744)
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 20 May 2014 12:47:21 +0100
 

Modified: trunk/kfreebsd-10/debian/patches/EN-14_05.ciss.patch
===================================================================
--- trunk/kfreebsd-10/debian/patches/EN-14_05.ciss.patch	2014-05-20 12:24:40 UTC (rev 5476)
+++ trunk/kfreebsd-10/debian/patches/EN-14_05.ciss.patch	2014-05-20 13:11:31 UTC (rev 5477)
@@ -52,11 +52,11 @@
 +			     target, 0);
 +
 +    if (status == CAM_REQ_CMP) {
-+	xpt_path_lock(path);
++    	mtx_lock(&sc->ciss_mtx);
 +	periph = cam_periph_find(path, NULL);
  	sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
  		periph->periph_name, periph->unit_number);
-+	xpt_path_unlock(path);
++    	mtx_unlock(&sc->ciss_mtx);
 +	xpt_free_path(path);
  	return(0);
      }