Date: Mon, 18 May 2009 17:14:49 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r192312 - in user/kmacy/releng_7_2_fcs/sys: amd64/conf conf kern Message-ID: <200905181714.n4IHEnI5068473@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Mon May 18 17:14:48 2009 New Revision: 192312 URL: http://svn.freebsd.org/changeset/base/192312 Log: make adaptive spinning on SX the default Modified: user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC user/kmacy/releng_7_2_fcs/sys/conf/options user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c Modified: user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC Mon May 18 17:14:23 2009 (r192311) +++ user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC Mon May 18 17:14:48 2009 (r192312) @@ -249,6 +249,5 @@ device bpf # Berkeley packet filter options DDB options KDB options ALT_BREAK_TO_DEBUGGER -options ADAPTIVE_SX options HWPMC_HOOKS Modified: user/kmacy/releng_7_2_fcs/sys/conf/options ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/conf/options Mon May 18 17:14:23 2009 (r192311) +++ user/kmacy/releng_7_2_fcs/sys/conf/options Mon May 18 17:14:48 2009 (r192312) @@ -62,7 +62,6 @@ NO_SYSCTL_DESCR opt_global.h # Miscellaneous options. ADAPTIVE_GIANT opt_adaptive_mutexes.h -ADAPTIVE_SX ALQ AUDIT opt_global.h CODA_COMPAT_5 opt_coda.h @@ -134,6 +133,7 @@ MPROF_BUFFERS opt_mprof.h MPROF_HASH_SIZE opt_mprof.h NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS +NO_ADAPTIVE_SX opt_adaptive_sx.h NSWBUF_MIN opt_swap.h MBUF_PACKET_ZONE_DISABLE opt_global.h PANIC_REBOOT_WAIT_TIME opt_panic.h Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c Mon May 18 17:14:23 2009 (r192311) +++ user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c Mon May 18 17:14:48 2009 (r192312) @@ -51,6 +51,10 @@ __FBSDID("$FreeBSD$"); #include <sys/sx.h> #include <sys/systm.h> +#if defined(SMP) && !defined(NO_ADAPTIVE_SX) +#define ADAPTIVE_SX +#endif + #ifdef ADAPTIVE_SX #include <machine/cpu.h> #endif @@ -59,10 +63,6 @@ __FBSDID("$FreeBSD$"); #include <ddb/ddb.h> #endif -#if !defined(SMP) && defined(ADAPTIVE_SX) -#error "You must have SMP to enable the ADAPTIVE_SX option" -#endif - CTASSERT(((SX_ADAPTIVESPIN | SX_RECURSE) & LO_CLASSFLAGS) == (SX_ADAPTIVESPIN | SX_RECURSE));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905181714.n4IHEnI5068473>