Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[linux-2.6-omap-h63xx.git] / include / linux / preempt.h

diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index dd98c54a23b4b44afd860603f2a3da73bb29ecbc..5769d14d1e6ab658b7ab8b2a2c9de117ec2b4838 100644 (file)
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -7,6 +7,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/thread_info.h>
 #include <linux/linkage.h>
 
 #ifdef CONFIG_DEBUG_PREEMPT
@@ -47,6 +48,7 @@ do { \
 #define preempt_enable() \
 do { \
        preempt_enable_no_resched(); \
+       barrier(); \
        preempt_check_resched(); \
 } while (0)