lkml.org 
[lkml]   [2010]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] x86, perf: Use apic_write unconditionally
    Commit-ID:  7335f75e9ca166044e38a96abad422d8e6e364b5
    Gitweb: http://git.kernel.org/tip/7335f75e9ca166044e38a96abad422d8e6e364b5
    Author: Cyrill Gorcunov <gorcunov@openvz.org>
    AuthorDate: Wed, 17 Mar 2010 13:37:01 +0300
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Thu, 18 Mar 2010 17:03:22 +0100

    x86, perf: Use apic_write unconditionally

    Since apic_write() maps to a plain noop in the !CONFIG_X86_LOCAL_APIC
    case we're safe to remove this conditional compilation and clean up
    the code a bit.

    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: fweisbec@gmail.com
    Cc: acme@redhat.com
    Cc: eranian@google.com
    Cc: peterz@infradead.org
    LKML-Reference: <20100317104356.232371479@openvz.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/cpu/perf_event.c | 4 ----
    arch/x86/kernel/cpu/perf_event_p4.c | 2 --
    2 files changed, 0 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index c97d5b5..14eca80 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -1136,7 +1136,6 @@ void set_perf_event_pending(void)

    void perf_events_lapic_init(void)
    {
    -#ifdef CONFIG_X86_LOCAL_APIC
    if (!x86_pmu.apic || !x86_pmu_initialized())
    return;

    @@ -1144,7 +1143,6 @@ void perf_events_lapic_init(void)
    * Always use NMI for PMU
    */
    apic_write(APIC_LVTPC, APIC_DM_NMI);
    -#endif
    }

    static int __kprobes
    @@ -1168,9 +1166,7 @@ perf_event_nmi_handler(struct notifier_block *self,

    regs = args->regs;

    -#ifdef CONFIG_X86_LOCAL_APIC
    apic_write(APIC_LVTPC, APIC_DM_NMI);
    -#endif
    /*
    * Can't rely on the handled return value to say it was our NMI, two
    * events could trigger 'simultaneously' raising two back-to-back NMIs.
    diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
    index a11ce73..0367889 100644
    --- a/arch/x86/kernel/cpu/perf_event_p4.c
    +++ b/arch/x86/kernel/cpu/perf_event_p4.c
    @@ -363,10 +363,8 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
    }

    if (handled) {
    -#ifdef CONFIG_X86_LOCAL_APIC
    /* p4 quirk: unmask it again */
    apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);
    -#endif
    inc_irq_stat(apic_perf_irqs);
    }


    \
     
     \ /
      Last update: 2010-03-18 18:41    [W:0.038 / U:0.896 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site