From c2956aa2d94f587d4f75df6a5d4b9bb3d8dc819a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sun, 14 Dec 2008 21:58:46 +0100 Subject: [PATCH] --- yaml --- r: 147159 b: refs/heads/master c: 75f224cf7700ed6006574dc3f2efa29860727570 h: refs/heads/master i: 147157: d88bda1aebe9cc2448e5ff1f615760312bb36064 147155: c6776d7fb97bd45a5e87f93a71b44fa4a7cf7e44 147151: 29c9da5d77304887ba6f868bd2efd4e7b62dd6c3 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_counter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 63484fddc6b3..e703a8953597 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 088e2852c858159d47f71ee8da38e0fb1b21f806 +refs/heads/master: 75f224cf7700ed6006574dc3f2efa29860727570 diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c index 6d30f603b62c..8a154bd7ba94 100644 --- a/trunk/arch/x86/kernel/cpu/perf_counter.c +++ b/trunk/arch/x86/kernel/cpu/perf_counter.c @@ -557,10 +557,10 @@ void __init init_hw_perf_counters(void) printk(KERN_INFO "... bit_width: %d\n", eax.split.bit_width); printk(KERN_INFO "... mask_length: %d\n", eax.split.mask_length); + perf_counters_initialized = true; + perf_counters_lapic_init(0); register_die_notifier(&perf_counter_nmi_notifier); - - perf_counters_initialized = true; } static void x86_perf_counter_read(struct perf_counter *counter)