On Sat, 31 Aug 2013 13:54:30 -0700
"Paul E. McKenney" <paul...@linux.vnet.ibm.com> wrote:
> On Sat, Aug 31, 2013 at 04:35:03PM -0400, Steven Rostedt wrote:
> > On Sat, 2013-08-31 at 12:46 -0700, Paul E. McKenney wrote:
> >
> > > > void arch_ftrace_update_code(int command);
> > > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> > > > index 06504b2..be87ac9 100644
> > > > --- a/kernel/trace/ftrace.c
> > > > +++ b/kernel/trace/ftrace.c
> > > > @@ -2645,7 +2645,10 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
> > > > !ftrace_lookup_ip(ops->notrace_hash, rec->ip)) ||
> > > >
> > > > ((iter->flags & FTRACE_ITER_ENABLED) &&
> > > > - !(rec->flags & FTRACE_FL_ENABLED))) {
> > > > + !(rec->flags & FTRACE_FL_ENABLED)) ||
> > > > +
> > >
> > > OK, I'll bite... Why the blank line?
> >
> > For readability. Here's the full if statement:
> >
> > if (((iter->flags & FTRACE_ITER_FILTER) &&
> > !(ftrace_lookup_ip(ops->filter_hash, rec->ip))) ||
> >
> > ((iter->flags & FTRACE_ITER_NOTRACE) &&
> > !ftrace_lookup_ip(ops->notrace_hash, rec->ip)) ||
> >
> > ((iter->flags & FTRACE_ITER_ENABLED) &&
> > !(rec->flags & FTRACE_FL_ENABLED)) ||
> >
> > ((iter->flags & FTRACE_ITER_UNSAFE_ONLY) &&
> > !ftrace_lookup_ip(ftrace_unsafe_rcu, rec->ip)) ||
> >
> > ((iter->flags & FTRACE_ITER_NO_UNSAFE) &&
> > ftrace_lookup_ip(ftrace_unsafe_rcu, rec->ip))) {
> >
> >
> > They are grouped in pairs.
>
> Fair enough!
Can I take this as an Acked-by?
-- Steve
>
> Thanx, Paul
>
> > -- Steve
> >
> > >
> > > Thanx, Paul
> > >
> > > > + ((iter->flags & FTRACE_ITER_NO_UNSAFE) &&
> > > > + ftrace_lookup_ip(ftrace_unsafe_rcu, rec->ip))) {
> > > >
> > > > rec = NULL;
> > > > goto retry;
> > > > @@ -2773,6 +2776,7 @@ ftrace_avail_open(struct inode *inode, struct
> > > > file *file)
> > > > iter = __seq_open_private(file, &show_ftrace_seq_ops,
> > > > sizeof(*iter));
> > > > if (iter) {
> > > > iter->pg = ftrace_pages_start;
> > > > + iter->flags = FTRACE_ITER_NO_UNSAFE;
> > > > iter->ops = &global_ops;
> > > > }
> > > >
> > > > --
> > > > 1.7.10.4
> > > >
> > > >
> >
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
