Date: Wed, 3 Sep 2014 23:15:54 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271065 - stable/10/sys/sys Message-ID: <201409032315.s83NFsgt027470@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Wed Sep 3 23:15:54 2014 New Revision: 271065 URL: http://svnweb.freebsd.org/changeset/base/271065 Log: Merge r270259 from head: Add a missing brace to callout_init_rm() to fix syntax. Modified: stable/10/sys/sys/callout.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/callout.h ============================================================================== --- stable/10/sys/sys/callout.h Wed Sep 3 23:14:26 2014 (r271064) +++ stable/10/sys/sys/callout.h Wed Sep 3 23:15:54 2014 (r271065) @@ -72,7 +72,7 @@ void _callout_init_lock(struct callout * _callout_init_lock((c), ((mtx) != NULL) ? &(mtx)->lock_object : \ NULL, (flags)) #define callout_init_rm(c, rm, flags) \ - _callout_init_lock((c), ((rm != NULL) ? &(rm)->lock_object : \ + _callout_init_lock((c), ((rm) != NULL) ? &(rm)->lock_object : \ NULL, (flags)) #define callout_init_rw(c, rw, flags) \ _callout_init_lock((c), ((rw) != NULL) ? &(rw)->lock_object : \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409032315.s83NFsgt027470>