On Mon, Dec 22, 2008 at 12:05:43PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sched tree got a conflict in
> include/linux/hardirq.h between commit
> 17666f02b118099028522dfc3df00a235700e216 ("ftrace: nmi safe code
> modification") from the ftrace tree and commit
> 64db4cfff99c04cd5f550357edcc8780f96b54a2 (""Tree RCU": scalable classic
> RCU implementation") from the sched tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks like the right approach to me!
Thanx, Paul
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc include/linux/hardirq.h
> index 89a56d7,9b70b92..0000000
> --- a/include/linux/hardirq.h
> +++ b/include/linux/hardirq.h
> @@@ -162,17 -163,7 +164,19 @@@ extern void irq_enter(void)
> */
> extern void irq_exit(void);
>
> -#define nmi_enter() do { lockdep_off(); rcu_nmi_enter(); __irq_enter(); } while (0)
> -#define nmi_exit() do { __irq_exit(); rcu_nmi_exit(); lockdep_on(); } while (0)
> +#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)
>
> #endif /* LINUX_HARDIRQ_H */
--
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
