From owner-svn-src-all@FreeBSD.ORG  Sat Jan 24 19:22:05 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2842106567A;
	Sat, 24 Jan 2009 19:22:05 +0000 (UTC)
	(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF4478FC12;
	Sat, 24 Jan 2009 19:22:05 +0000 (UTC)
	(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OJM5uh096486;
	Sat, 24 Jan 2009 19:22:05 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0OJM5He096485;
	Sat, 24 Jan 2009 19:22:05 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <200901241922.n0OJM5He096485@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 24 Jan 2009 19:22:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187674 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2009 19:22:06 -0000

Author: antoine
Date: Sat Jan 24 19:22:05 2009
New Revision: 187674
URL: http://svn.freebsd.org/changeset/base/187674

Log:
  MFC r182047 to stable/7:
    Remove unused variable nosleepwithlocks.
  
    PR:             126609
    Submitted by:   Mateusz Guzik
    MFC after:      1 month
    X-MFC:          to stable/7 only, this variable is still used in stable/6
  Reviewed by:	rwatson

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/vm/uma_core.c

Modified: stable/7/sys/vm/uma_core.c
==============================================================================
--- stable/7/sys/vm/uma_core.c	Sat Jan 24 18:57:22 2009	(r187673)
+++ stable/7/sys/vm/uma_core.c	Sat Jan 24 19:22:05 2009	(r187674)
@@ -249,13 +249,6 @@ void uma_print_stats(void);
 static int sysctl_vm_zone_count(SYSCTL_HANDLER_ARGS);
 static int sysctl_vm_zone_stats(SYSCTL_HANDLER_ARGS);
 
-#ifdef WITNESS
-static int nosleepwithlocks = 1;
-#else
-static int nosleepwithlocks = 0;
-#endif
-SYSCTL_INT(_debug, OID_AUTO, nosleepwithlocks, CTLFLAG_RW, &nosleepwithlocks,
-    0, "Convert M_WAITOK to M_NOWAIT to avoid lock-held-across-sleep paths");
 SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL);
 
 SYSCTL_PROC(_vm, OID_AUTO, zone_count, CTLFLAG_RD|CTLTYPE_INT,