* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> +#define nmi_enter() \
> + do { \
> + ftrace_nmi_enter(); \
> + lockdep_off(); \
> ++ rcu_nmi_enter(); \
> + __irq_enter(); \
> + } while (0)
> +#define nmi_exit() \
> + do { \
> + __irq_exit(); \
> ++ rcu_nmi_exit(); \
> + lockdep_on(); \
> + ftrace_nmi_exit(); \
> + } while (0)
yes, that's the same resolution i did for this conflict three days ago in
tip/master. Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
