diff options
| author | attilio <attilio@FreeBSD.org> | 2009-05-29 08:01:48 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2009-05-29 08:01:48 +0000 |
| commit | 4ae494ac2ce20fd4f360353155ad4db6f66e82a7 (patch) | |
| tree | 1ef4ca22a98c8186c5a3eaf75d9ec0caa534e376 /sys/kern/kern_sx.c | |
| parent | fb4a68cc3a982243575f41ccff8d3d019133027b (diff) | |
| download | FreeBSD-src-4ae494ac2ce20fd4f360353155ad4db6f66e82a7.zip FreeBSD-src-4ae494ac2ce20fd4f360353155ad4db6f66e82a7.tar.gz | |
The patch for r193011 was partially rejected when applied, complete it.
Diffstat (limited to 'sys/kern/kern_sx.c')
| -rw-r--r-- | sys/kern/kern_sx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 9e2a1fb..6342252 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -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 |
