svn commit: r193025 - head/sys/kern
Attilio Rao
attilio at FreeBSD.org
Fri May 29 08:01:49 UTC 2009
Author: attilio
Date: Fri May 29 08:01:48 2009
New Revision: 193025
URL: http://svn.freebsd.org/changeset/base/193025
Log:
The patch for r193011 was partially rejected when applied, complete it.
Modified:
head/sys/kern/kern_sx.c
Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c Fri May 29 07:55:44 2009 (r193024)
+++ head/sys/kern/kern_sx.c Fri May 29 08:01:48 2009 (r193025)
@@ -36,23 +36,25 @@
* so should not be relied upon in combination with sx locks.
*/
-#include "opt_adaptive_sx.h"
#include "opt_ddb.h"
#include "opt_kdtrace.h"
+#include "opt_no_adaptive_sx.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/ktr.h>
+#include <sys/linker_set.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/sleepqueue.h>
#include <sys/sx.h>
+#include <sys/sysctl.h>
#include <sys/systm.h>
-#ifdef ADAPTIVE_SX
+#if defined(SMP) && !defined(NO_ADAPTIVE_SX)
#include <machine/cpu.h>
#endif
More information about the svn-src-all
mailing list