From 35a29c37b93078cb8806922d6ac1604b6332e2b5 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 25 May 2009 21:41:28 +0200 Subject: [PATCH] --- yaml --- r: 147507 b: refs/heads/master c: 53b441a565bf4036ab49c8ea04c5ad06ace7dd6b h: refs/heads/master i: 147505: 0075d24e1728593941633e2ab7bae9630fe2c298 147503: 1ea3c8fbd84aeffb2aecc90ca17f93503648a78a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_counter.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18261dca777d..a89560e086d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a78ac3258782f3e64cb40beb5990808e1febcc0c +refs/heads/master: 53b441a565bf4036ab49c8ea04c5ad06ace7dd6b diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c index c4b543d1a86f..189bf9d7cdab 100644 --- a/trunk/arch/x86/kernel/cpu/perf_counter.c +++ b/trunk/arch/x86/kernel/cpu/perf_counter.c @@ -293,7 +293,6 @@ static int __hw_perf_counter_init(struct perf_counter *counter) return -EACCES; hwc->nmi = 1; } - perf_counters_lapic_init(hwc->nmi); if (!hwc->irq_period) hwc->irq_period = x86_pmu.max_period; @@ -612,6 +611,8 @@ static int x86_pmu_enable(struct perf_counter *counter) hwc->counter_base = x86_pmu.perfctr; } + perf_counters_lapic_init(hwc->nmi); + x86_pmu.disable(hwc, idx); cpuc->counters[idx] = counter; @@ -1037,7 +1038,7 @@ void __init init_hw_perf_counters(void) pr_info("... counter mask: %016Lx\n", perf_counter_mask); - perf_counters_lapic_init(1); + perf_counters_lapic_init(0); register_die_notifier(&perf_counter_nmi_notifier); }