lkml.org 
[lkml]   [2010]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf/core, x86: Remove duplicate perf_event_mask variable
    Commit-ID:  d6dc0b4ead6e8720096ecfa3d9e899b47ddbc8ed
    Gitweb: http://git.kernel.org/tip/d6dc0b4ead6e8720096ecfa3d9e899b47ddbc8ed
    Author: Robert Richter <robert.richter@amd.com>
    AuthorDate: Wed, 17 Mar 2010 12:49:13 +0100
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 17 Mar 2010 13:06:59 +0100

    perf/core, x86: Remove duplicate perf_event_mask variable

    The same information is stored also in x86_pmu.intel_ctrl. This
    patch removes perf_event_mask and instead uses
    x86_pmu.intel_ctrl directly.

    Signed-off-by: Robert Richter <robert.richter@amd.com>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <1268826553-19518-5-git-send-email-robert.richter@amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/cpu/perf_event.c | 9 +++------
    1 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index 104292a..c97d5b5 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -75,8 +75,6 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
    return len;
    }

    -static u64 perf_event_mask __read_mostly;
    -
    struct event_constraint {
    union {
    unsigned long idxmsk[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
    @@ -1406,7 +1404,7 @@ void __init init_hw_perf_events(void)
    x86_pmu.num_events, X86_PMC_MAX_GENERIC);
    x86_pmu.num_events = X86_PMC_MAX_GENERIC;
    }
    - perf_event_mask = (1 << x86_pmu.num_events) - 1;
    + x86_pmu.intel_ctrl = (1 << x86_pmu.num_events) - 1;
    perf_max_events = x86_pmu.num_events;

    if (x86_pmu.num_events_fixed > X86_PMC_MAX_FIXED) {
    @@ -1415,9 +1413,8 @@ void __init init_hw_perf_events(void)
    x86_pmu.num_events_fixed = X86_PMC_MAX_FIXED;
    }

    - perf_event_mask |=
    + x86_pmu.intel_ctrl |=
    ((1LL << x86_pmu.num_events_fixed)-1) << X86_PMC_IDX_FIXED;
    - x86_pmu.intel_ctrl = perf_event_mask;

    perf_events_lapic_init();
    register_die_notifier(&perf_event_nmi_notifier);
    @@ -1442,7 +1439,7 @@ void __init init_hw_perf_events(void)
    pr_info("... value mask: %016Lx\n", x86_pmu.event_mask);
    pr_info("... max period: %016Lx\n", x86_pmu.max_period);
    pr_info("... fixed-purpose events: %d\n", x86_pmu.num_events_fixed);
    - pr_info("... event mask: %016Lx\n", perf_event_mask);
    + pr_info("... event mask: %016Lx\n", x86_pmu.intel_ctrl);

    perf_cpu_notifier(x86_pmu_notifier);
    }

    \
     
     \ /
      Last update: 2010-03-17 13:13    [W:0.024 / U:33.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site