lkml.org 
[lkml]   [2010]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/9] perf, x86: reduce number of CONFIG_X86_LOCAL_APIC macros
    Date
    The function reserve_pmc_hardware() and release_pmc_hardware() were
    hard to read. This patch improves readablity of the code by removing
    most of the CONFIG_X86_LOCAL_APIC macros.

    Signed-off-by: Robert Richter <robert.richter@amd.com>
    ---
    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 6531b4b..96b3a98 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -234,9 +234,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)
    @@ -251,11 +252,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);
    @@ -270,12 +269,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++) {
    @@ -285,9 +282,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 inline bool bts_available(void)
    {
    return x86_pmu.enable_bts != NULL;
    --
    1.7.0



    \
     
     \ /
      Last update: 2010-03-04 17:55    [W:0.027 / U:0.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site