lkml.org 
[lkml]   [2009]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RESEND PATCH] x86/perf_count: update x86_pmu after WARN

    should print out before changing the value

    [Impact: get right print when clipping num_conunters]

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>

    ---
    arch/x86/kernel/cpu/perf_counter.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    Index: linux-2.6/arch/x86/kernel/cpu/perf_counter.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/cpu/perf_counter.c
    +++ linux-2.6/arch/x86/kernel/cpu/perf_counter.c
    @@ -1496,17 +1496,17 @@ void __init init_hw_perf_counters(void)
    pr_cont("%s PMU driver.\n", x86_pmu.name);

    if (x86_pmu.num_counters > X86_PMC_MAX_GENERIC) {
    - x86_pmu.num_counters = X86_PMC_MAX_GENERIC;
    WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",
    x86_pmu.num_counters, X86_PMC_MAX_GENERIC);
    + x86_pmu.num_counters = X86_PMC_MAX_GENERIC;
    }
    perf_counter_mask = (1 << x86_pmu.num_counters) - 1;
    perf_max_counters = x86_pmu.num_counters;

    if (x86_pmu.num_counters_fixed > X86_PMC_MAX_FIXED) {
    - x86_pmu.num_counters_fixed = X86_PMC_MAX_FIXED;
    WARN(1, KERN_ERR "hw perf counters fixed %d > max(%d), clipping!",
    x86_pmu.num_counters_fixed, X86_PMC_MAX_FIXED);
    + x86_pmu.num_counters_fixed = X86_PMC_MAX_FIXED;
    }

    perf_counter_mask |=

    \
     
     \ /
      Last update: 2009-06-29 09:45    [W:0.021 / U:97.384 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site