aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-14 15:58:46 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-14 16:00:31 -0500
commit75f224cf7700ed6006574dc3f2efa29860727570 (patch)
tree5b27887879cb3aedca83e786112baa9920b146ed
parent088e2852c858159d47f71ee8da38e0fb1b21f806 (diff)
perfcounters: fix lapic initialization
Fix non-working NMI sampling in certain bootup scenarios. Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 6d30f603b62c..8a154bd7ba94 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -557,10 +557,10 @@ void __init init_hw_perf_counters(void)
557 printk(KERN_INFO "... bit_width: %d\n", eax.split.bit_width); 557 printk(KERN_INFO "... bit_width: %d\n", eax.split.bit_width);
558 printk(KERN_INFO "... mask_length: %d\n", eax.split.mask_length); 558 printk(KERN_INFO "... mask_length: %d\n", eax.split.mask_length);
559 559
560 perf_counters_initialized = true;
561
560 perf_counters_lapic_init(0); 562 perf_counters_lapic_init(0);
561 register_die_notifier(&perf_counter_nmi_notifier); 563 register_die_notifier(&perf_counter_nmi_notifier);
562
563 perf_counters_initialized = true;
564} 564}
565 565
566static void x86_perf_counter_read(struct perf_counter *counter) 566static void x86_perf_counter_read(struct perf_counter *counter)