From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 19 11:51:20 2014 Return-Path: Delivered-To: svn-src-stable-9@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35A8945E; Sun, 19 Jan 2014 11:51:20 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 9EF30165C; Sun, 19 Jan 2014 11:51:15 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id NAA17330; Sun, 19 Jan 2014 13:51:13 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1W4quH-0008KY-HO; Sun, 19 Jan 2014 13:51:13 +0200 Message-ID: <52DBBBF9.7050108@FreeBSD.org> Date: Sun, 19 Jan 2014 13:50:17 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Sergey Kandaurov , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-9@FreeBSD.org Subject: Re: svn commit: r260862 - stable/9/sys/sys References: <201401182121.s0ILLjkW048120@svn.freebsd.org> In-Reply-To: <201401182121.s0ILLjkW048120@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2014 11:51:20 -0000 on 18/01/2014 23:21 Sergey Kandaurov said the following: > Author: pluknet > Date: Sat Jan 18 21:21:44 2014 > New Revision: 260862 > URL: http://svnweb.freebsd.org/changeset/base/260862 > > Log: > MFC r250816: > > Protect SDT_PROBE() with do { } while (0) loop. Thanks a lot! > Modified: > stable/9/sys/sys/sdt.h > Directory Properties: > stable/9/sys/ (props changed) > stable/9/sys/sys/ (props changed) > > Modified: stable/9/sys/sys/sdt.h > ============================================================================== > --- stable/9/sys/sys/sdt.h Sat Jan 18 20:54:55 2014 (r260861) > +++ stable/9/sys/sys/sdt.h Sat Jan 18 21:21:44 2014 (r260862) > @@ -136,11 +136,12 @@ SET_DECLARE(sdt_argtypes_set, struct sdt > #define SDT_PROBE_DECLARE(prov, mod, func, name) \ > extern struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] > > -#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \ > +#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) do { \ > if (sdt_##prov##_##mod##_##func##_##name->id) \ > (*sdt_probe_func)(sdt_##prov##_##mod##_##func##_##name->id, \ > (uintptr_t) arg0, (uintptr_t) arg1, (uintptr_t) arg2, \ > - (uintptr_t) arg3, (uintptr_t) arg4) > + (uintptr_t) arg3, (uintptr_t) arg4); \ > +} while (0) > > #define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type) \ > static struct sdt_argtype sdt_##prov##_##mod##_##func##_##name##num[1] \ > -- Andriy Gapon