From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 23 15:52:40 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 75720BFB;
 Wed, 23 Oct 2013 15:52:40 +0000 (UTC)
 (envelope-from will@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 636552929;
 Wed, 23 Oct 2013 15:52:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NFqeld036673;
 Wed, 23 Oct 2013 15:52:40 GMT (envelope-from will@svn.freebsd.org)
Received: (from will@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NFqeEE036672;
 Wed, 23 Oct 2013 15:52:40 GMT (envelope-from will@svn.freebsd.org)
Message-Id: <201310231552.r9NFqeEE036672@svn.freebsd.org>
From: Will Andrews <will@FreeBSD.org>
Date: Wed, 23 Oct 2013 15:52:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r256979 - projects/vps/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 15:52:40 -0000

Author: will
Date: Wed Oct 23 15:52:39 2013
New Revision: 256979
URL: http://svnweb.freebsd.org/changeset/base/256979

Log:
  Sync with svn.7he.at/vps/trunk r183
  
  r183 | klaus | 2013-07-06 09:41:22 -0600 (Sat, 06 Jul 2013) | 3 lines
  Fixed missing lock statement in deadlkres().
  
  Submitted by:	Klaus P. Ohrhallinger <k@7he.at>

Modified:
  projects/vps/sys/kern/kern_clock.c

Modified: projects/vps/sys/kern/kern_clock.c
==============================================================================
--- projects/vps/sys/kern/kern_clock.c	Wed Oct 23 15:29:42 2013	(r256978)
+++ projects/vps/sys/kern/kern_clock.c	Wed Oct 23 15:52:39 2013	(r256979)
@@ -232,6 +232,9 @@ deadlkres(void)
 				    __func__);
 			tryl++;
 			pause("allproc", sleepfreq * hz);
+#ifdef VPS
+			sx_slock(&vps_all_lock);
+#endif /* VPS */
 			continue;
 		}
 		tryl = 0;