lkml.org 
[lkml]   [2013]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 019/103] powerpc/perf: Use existing out label in power_pmu_enable()
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Michael Ellerman <michael@ellerman.id.au>

    commit 0a48843d6c5114cfa4a9540ee4d6af87628cec01 upstream.

    In power_pmu_enable() we can use the existing out label to reduce the
    number of return paths.

    Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/perf/core-book3s.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/arch/powerpc/perf/core-book3s.c
    +++ b/arch/powerpc/perf/core-book3s.c
    @@ -919,12 +919,13 @@ static void power_pmu_enable(struct pmu

    if (!ppmu)
    return;
    +
    local_irq_save(flags);
    +
    cpuhw = &__get_cpu_var(cpu_hw_events);
    - if (!cpuhw->disabled) {
    - local_irq_restore(flags);
    - return;
    - }
    + if (!cpuhw->disabled)
    + goto out;
    +
    cpuhw->disabled = 0;

    /*



    \
     
     \ /
      Last update: 2013-07-24 01:41    [W:4.082 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site