svn commit: r187674 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb vm

[Antoine Brodin]

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,