X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fpreempt.h;h=d0926d63406ca8e76a3d89ddc3f307a43ef6f391;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=dd98c54a23b4b44afd860603f2a3da73bb29ecbc;hpb=6a77f38946aaee1cd85eeec6cf4229b204c15071;p=linux-2.6.git

diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index dd98c54a2..d0926d634 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -6,7 +6,7 @@
  * preempt_count (used for kernel preemption, interrupt count, etc.)
  */
 
-#include <linux/config.h>
+#include <linux/thread_info.h>
 #include <linux/linkage.h>
 
 #ifdef CONFIG_DEBUG_PREEMPT
@@ -47,6 +47,7 @@ do { \
 #define preempt_enable() \
 do { \
 	preempt_enable_no_resched(); \
+	barrier(); \
 	preempt_check_resched(); \
 } while (0)