On Fri, May 31, 2013 at 10:47:24AM +0200, Robert Richter wrote: > From: Robert Richter <robert.rich...@calxeda.com> > > Improve error reporting. > > Signed-off-by: Robert Richter <robert.rich...@calxeda.com> > --- > kernel/events/persistent.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/kernel/events/persistent.c b/kernel/events/persistent.c > index 1e6c03a..6612eb77 100644 > --- a/kernel/events/persistent.c > +++ b/kernel/events/persistent.c > @@ -123,15 +123,15 @@ int perf_add_persistent_event(struct perf_event_attr > *attr, unsigned nr_pages) > > for_each_possible_cpu(i) { > event = add_persistent_event_on_cpu(i, attr, nr_pages); > - if (IS_ERR(event)) { > - pr_err("%s: Error adding persistent event on cpu %d\n", > - __func__, i); > + if (IS_ERR(event)) > goto unwind; > - } > } > return 0; > > unwind: > + pr_err("%s: Error adding persistent event on cpu %d: %ld\n", > + __func__, i, PTR_ERR(event)); > + > while (--i >= 0) > del_persistent_event(i, attr);
Should also be merged. Thanks. -- 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/