Date: Wed, 2 Mar 2011 19:43:31 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r219197 - stable/8/sys/compat/linux Message-ID: <201103021943.p22JhVhb042833@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Wed Mar 2 19:43:31 2011 New Revision: 219197 URL: http://svn.freebsd.org/changeset/base/219197 Log: MFC r218654, r218655: Stop printing the LOR, as this is expected behavior. Remove comment about 'ftlk' LOR. Modified: stable/8/sys/compat/linux/linux_futex.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/compat/linux/linux_futex.c ============================================================================== --- stable/8/sys/compat/linux/linux_futex.c Wed Mar 2 19:41:09 2011 (r219196) +++ stable/8/sys/compat/linux/linux_futex.c Wed Mar 2 19:43:31 2011 (r219197) @@ -88,7 +88,7 @@ struct futex_list futex_list; #define FUTEX_LOCK(f) sx_xlock(&(f)->f_lck) #define FUTEX_UNLOCK(f) sx_xunlock(&(f)->f_lck) -#define FUTEX_INIT(f) sx_init_flags(&(f)->f_lck, "ftlk", 0) +#define FUTEX_INIT(f) sx_init_flags(&(f)->f_lck, "ftlk", SX_DUPOK) #define FUTEX_DESTROY(f) sx_destroy(&(f)->f_lck) #define FUTEX_ASSERT_LOCKED(f) sx_assert(&(f)->f_lck, SA_XLOCKED) @@ -565,8 +565,7 @@ linux_sys_futex(struct thread *td, struc /* * To avoid deadlocks return EINVAL if second futex - * exists at this time. Otherwise create the new futex - * and ignore false positive LOR which thus happens. + * exists at this time. * * Glibc fall back to FUTEX_WAKE in case of any error * returned by FUTEX_CMP_REQUEUE.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103021943.p22JhVhb042833>