lkml.org 
[lkml]   [2009]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perfcounters/core] perf_counter, x86: remove ack_status() from struct x86_pmu
    Commit-ID:  dee5d9067ca78b317538fd67930be4e09a83dbc5
    Gitweb: http://git.kernel.org/tip/dee5d9067ca78b317538fd67930be4e09a83dbc5
    Author: Robert Richter <robert.richter@amd.com>
    AuthorDate: Wed, 29 Apr 2009 12:47:07 +0200
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 29 Apr 2009 14:51:05 +0200

    perf_counter, x86: remove ack_status() from struct x86_pmu

    This function is Intel only and not necessary for AMD cpus.

    [ Impact: simplify code ]

    Signed-off-by: Robert Richter <robert.richter@amd.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <1241002046-8832-11-git-send-email-robert.richter@amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    arch/x86/kernel/cpu/perf_counter.c | 19 ++-----------------
    1 files changed, 2 insertions(+), 17 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
    index d0bb029..6bbdc16 100644
    --- a/arch/x86/kernel/cpu/perf_counter.c
    +++ b/arch/x86/kernel/cpu/perf_counter.c
    @@ -51,7 +51,6 @@ struct x86_pmu {
    int (*handle_irq)(struct pt_regs *, int);
    u64 (*save_disable_all)(void);
    void (*restore_all)(u64);
    - void (*ack_status)(u64);
    void (*enable)(int, u64);
    void (*disable)(int, u64);
    unsigned eventsel;
    @@ -415,23 +414,11 @@ static inline u64 intel_pmu_get_status(u64 mask)
    return status;
    }

    -static void intel_pmu_ack_status(u64 ack)
    +static inline void intel_pmu_ack_status(u64 ack)
    {
    wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, ack);
    }

    -static void amd_pmu_ack_status(u64 ack)
    -{
    -}
    -
    -static void hw_perf_ack_status(u64 ack)
    -{
    - if (unlikely(!perf_counters_initialized))
    - return;
    -
    - x86_pmu->ack_status(ack);
    -}
    -
    static void intel_pmu_enable_counter(int idx, u64 config)
    {
    wrmsrl(MSR_ARCH_PERFMON_EVENTSEL0 + idx,
    @@ -788,7 +775,7 @@ again:
    __x86_pmu_disable(counter, &counter->hw, bit);
    }

    - hw_perf_ack_status(ack);
    + intel_pmu_ack_status(ack);

    /*
    * Repeat if there is more work to be done:
    @@ -904,7 +891,6 @@ static struct x86_pmu intel_pmu = {
    .handle_irq = intel_pmu_handle_irq,
    .save_disable_all = intel_pmu_save_disable_all,
    .restore_all = intel_pmu_restore_all,
    - .ack_status = intel_pmu_ack_status,
    .enable = intel_pmu_enable_counter,
    .disable = intel_pmu_disable_counter,
    .eventsel = MSR_ARCH_PERFMON_EVENTSEL0,
    @@ -918,7 +904,6 @@ static struct x86_pmu amd_pmu = {
    .handle_irq = amd_pmu_handle_irq,
    .save_disable_all = amd_pmu_save_disable_all,
    .restore_all = amd_pmu_restore_all,
    - .ack_status = amd_pmu_ack_status,
    .enable = amd_pmu_enable_counter,
    .disable = amd_pmu_disable_counter,
    .eventsel = MSR_K7_EVNTSEL0,

    \
     
     \ /
      Last update: 2009-04-29 15:11    [W:4.043 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site