Date: Fri, 29 May 2009 08:01:48 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r193025 - head/sys/kern Message-ID: <200905290801.n4T81mf7064216@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905290801.n4T81mf7064216>