Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / include / linux / preempt.h

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