svn commit: r260862 - stable/9/sys/sys

[Andriy Gapon]

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