vserver 2.0 rc7

[linux-2.6.git] / arch / i386 / oprofile / nmi_timer_int.c

diff --git a/arch/i386/oprofile/nmi_timer_int.c b/arch/i386/oprofile/nmi_timer_int.c
index b2e462a..c58d0c1 100644 (file)
--- a/arch/i386/oprofile/nmi_timer_int.c
+++ b/arch/i386/oprofile/nmi_timer_int.c
@@ -36,7 +36,7 @@ static void timer_stop(void)
 {
        enable_timer_nmi_watchdog();
        unset_nmi_callback();
-       synchronize_kernel();
+       synchronize_sched();  /* Allow already-started NMIs to complete. */
 }