[tip:perf/core] perf/core, x86: Reduce number of CONFIG_X86_LOCAL_APIC macros
in [Kernel]
|
Prev: [tip:perf/core] perf/core, x86: Remove cpu_hw_events.interrupts
Next: [PATCH 1/2]: serial8250: Use native_io_delay on the x86
From: tip-bot for Robert Richter on 17 Mar 2010 08:20 Commit-ID: b27ea29c6267889be255f2217fa7a6106e6a8b04 Gitweb: http://git.kernel.org/tip/b27ea29c6267889be255f2217fa7a6106e6a8b04 Author: Robert Richter <robert.richter(a)amd.com> AuthorDate: Wed, 17 Mar 2010 12:49:10 +0100 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Wed, 17 Mar 2010 13:06:58 +0100 perf/core, x86: Reduce number of CONFIG_X86_LOCAL_APIC macros The function reserve_pmc_hardware() and release_pmc_hardware() were hard to read. This patch improves readability of the code by removing most of the CONFIG_X86_LOCAL_APIC macros. Signed-off-by: Robert Richter <robert.richter(a)amd.com> Cc: Stephane Eranian <eranian(a)google.com> Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl> LKML-Reference: <1268826553-19518-2-git-send-email-robert.richter(a)amd.com> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/cpu/perf_event.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 5dacf63..793e63f 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -313,9 +313,10 @@ again: static atomic_t active_events; static DEFINE_MUTEX(pmc_reserve_mutex); +#ifdef CONFIG_X86_LOCAL_APIC + static bool reserve_pmc_hardware(void) { -#ifdef CONFIG_X86_LOCAL_APIC int i; if (nmi_watchdog == NMI_LOCAL_APIC) @@ -330,11 +331,9 @@ static bool reserve_pmc_hardware(void) if (!reserve_evntsel_nmi(x86_pmu.eventsel + i)) goto eventsel_fail; } -#endif return true; -#ifdef CONFIG_X86_LOCAL_APIC eventsel_fail: for (i--; i >= 0; i--) release_evntsel_nmi(x86_pmu.eventsel + i); @@ -349,12 +348,10 @@ perfctr_fail: enable_lapic_nmi_watchdog(); return false; -#endif } static void release_pmc_hardware(void) { -#ifdef CONFIG_X86_LOCAL_APIC int i; for (i = 0; i < x86_pmu.num_events; i++) { @@ -364,9 +361,15 @@ static void release_pmc_hardware(void) if (nmi_watchdog == NMI_LOCAL_APIC) enable_lapic_nmi_watchdog(); -#endif } +#else + +static bool reserve_pmc_hardware(void) { return true; } +static void release_pmc_hardware(void) {} + +#endif + static int reserve_ds_buffers(void); static void release_ds_buffers(void); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |