svn commit: r314667 - in stable/10/sys: amd64/amd64 cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs cddl/dev/profile compat/ndis contrib/ipfilter/netinet dev/a...

[Julian Elischer]

On 4/3/17 9:03 pm, Andriy Gapon wrote:
> Author: avg
> Date: Sat Mar  4 13:03:31 2017
> New Revision: 314667
> URL: https://svnweb.freebsd.org/changeset/base/314667
>
> Log:
>    MFC r283291: don't use CALLOUT_MPSAFE with callout_init()
>    
>    The main purpose of this MFC is to reduce conflicts for other merges.
>    Parts of the original change have already "trickled down" via individual MFCs.

is there a better name than ''1" when you replace " CALLOUT_MPSAFE"?

> -	callout_init(&watchdog_callout, CALLOUT_MPSAFE);
> +	callout_init(&watchdog_callout, 1);
>   	if (watchdog_cpu != -1)
>   		watchdog_change(watchdog_cpu);