Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kernel / apic / hw_nmi.c

diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index 73eb5b336f63cbab0a25679909712c7984c743c8..c3fcb5de508391ca20684669b3746a2c734cad02 100644 (file)
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -57,7 +57,7 @@ void arch_trigger_all_cpu_backtrace(void)
        }
 
        clear_bit(0, &backtrace_flag);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 }
 
 static int