Messages in this thread | | | Subject | Re: [PATCH 1/2] Revert "trace-cmd: Add function declaration to fix compile warning" | From | Steven Rostedt <> | Date | Mon, 21 May 2012 10:14:45 -0400 |
| |
On Mon, 2012-03-19 at 13:28 -0700, Vaibhav Nagarnaik wrote: > This reverts commit 1fc4fb039bfa3f0358d7e9810de71c58a7b32b64. > > Steven added commit ba911ea7fc1fdd13e3bce1b2001f5b432df8edae which does > exactly the same thing. Now we end up with a duplicate declaration of > the function trace_util_ftrace_options(). Reverting the commit gets rid > of the warning.
Cleaning out my INBOX again, and came across these two patches. I applied them now.
My INBOX gets blasted sometimes, and I miss patches like this. Don't be afraid to ping me after a week if I don't apply them.
Or if you don't mind waiting a few months, where I start cleaning out my INBOX, I'll apply them when I come across them again ;-)
-- Steve
> > Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com> > --- > trace-cmd.h | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/trace-cmd.h b/trace-cmd.h > index 3f522ee..f904dc5 100644 > --- a/trace-cmd.h > +++ b/trace-cmd.h > @@ -218,7 +218,6 @@ long tracecmd_flush_recording(struct tracecmd_recorder *recorder); > /* --- Plugin handling --- */ > extern struct plugin_option trace_ftrace_options[]; > > -void trace_util_ftrace_options(void); > void trace_util_add_option(const char *name, const char *val); > void trace_util_load_plugins(struct pevent *pevent, const char *suffix, > void (*load_plugin)(struct pevent *pevent,
| |