This is a note to let you know that I've just added the patch titled powerpc/perf: Use existing out label in power_pmu_enable() to the 3.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: powerpc-perf-use-existing-out-label-in-power_pmu_enable.patch and it can be found in the queue-3.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 0a48843d6c5114cfa4a9540ee4d6af87628cec01 Mon Sep 17 00:00:00 2001 From: Michael Ellerman <michael@xxxxxxxxxxxxxx> Date: Fri, 28 Jun 2013 18:15:13 +1000 Subject: powerpc/perf: Use existing out label in power_pmu_enable() From: Michael Ellerman <michael@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx> Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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; /* Patches currently in stable-queue which might be from michael@xxxxxxxxxxxxxx are queue-3.10/powerpc-perf-don-t-enable-if-we-have-zero-events.patch queue-3.10/powerpc-rename-and-flesh-out-the-facility-unavailable-exception-handler.patch queue-3.10/powerpc-perf-check-that-events-only-include-valid-bits-on-power8.patch queue-3.10/powerpc-wire-up-the-hv-facility-unavailable-exception.patch queue-3.10/powerpc-remove-kvmtest-from-relon-exception-handlers.patch queue-3.10/powerpc-perf-rework-disable-logic-in-pmu_disable.patch queue-3.10/powerpc-remove-unreachable-relocation-on-exception-handlers.patch queue-3.10/powerpc-perf-freeze-pmc5-6-if-we-re-not-using-them.patch queue-3.10/powerpc-perf-use-existing-out-label-in-power_pmu_enable.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html