On Mon, Jan 14, 2013 at 10:08:41PM -0500, Steven Rostedt wrote: > On Mon, 2013-01-14 at 11:49 -0800, Paul E. McKenney wrote: > > > diff --git a/kernel/rcu.h b/kernel/rcu.h > > index 7f8e759..b5d30c3 100644 > > --- a/kernel/rcu.h > > +++ b/kernel/rcu.h > > @@ -24,6 +24,7 @@ > > #define __LINUX_RCU_H > > > > #ifdef CONFIG_RCU_TRACE > > +#include <linux/trace_clock.h> > > #define RCU_TRACE(stmt) stmt > > #else /* #ifdef CONFIG_RCU_TRACE */ > > #define RCU_TRACE(stmt) > > @@ -118,4 +119,13 @@ int rcu_jiffies_till_stall_check(void); > > > > #endif /* #ifdef CONFIG_RCU_STALL_COMMON */ > > > > +static inline u64 notrace rcu_trace_clock_local(void) > > "inline" now implies notrace. That is, we define inline to include > notrace in the headers. The 'notrace' now is redundant. Cool!!! I have removed the "notrace", having just barely resisted the urge to add two more instances of "notrace", just for good measure. ;-) Thanx, Paul > -- Steve > > > +{ > > +#ifdef CONFIG_RCU_TRACE > > + return trace_clock_local(); > > +#else /* #ifdef CONFIG_RCU_TRACE */ > > + return 0; > > +#endif /* #else #ifdef CONFIG_RCU_TRACE */ > > +} > > + > > #endif /* __LINUX_RCU_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