lkml.org 
[lkml]   [2012]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] ftrace: Remove a superfluous check


    On Thu, 29 Mar 2012, Borislav Petkov wrote:

    > From: Borislav Petkov <borislav.petkov@amd.com>
    >
    > register_ftrace_function() checks ftrace_disabled and calls
    > __register_ftrace_function which does it again.
    >
    > Drop the first check and add the unlikely hint to the second one.
    >
    > No functional change.
    >
    > Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    > ---
    > kernel/trace/ftrace.c | 6 +-----
    > 1 file changed, 1 insertion(+), 5 deletions(-)
    >
    > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
    > index 867bd1dd2dd0..f9212017406d 100644
    > --- a/kernel/trace/ftrace.c
    > +++ b/kernel/trace/ftrace.c
    > @@ -311,7 +311,7 @@ static int remove_ftrace_list_ops(struct ftrace_ops **list,
    >
    > static int __register_ftrace_function(struct ftrace_ops *ops)
    > {
    > - if (ftrace_disabled)
    > + if (unlikely(ftrace_disabled))
    > return -ENODEV;
    >
    > if (FTRACE_WARN_ON(ops == &global_ops))
    > @@ -4304,14 +4304,10 @@ int register_ftrace_function(struct ftrace_ops *ops)
    >
    > mutex_lock(&ftrace_lock);
    >
    > - if (unlikely(ftrace_disabled))
    > - goto out_unlock;
    > -
    > ret = __register_ftrace_function(ops);
    > if (!ret)
    > ret = ftrace_startup(ops, 0);
    >
    > -
    > out_unlock:
    > mutex_unlock(&ftrace_lock);
    > return ret;
    > --

    If you're going to do this, then you can drop the label too.

    Thanks
    John Kacur


    \
     
     \ /
      Last update: 2012-03-29 19:07    [W:0.021 / U:29.000 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site