From c5428f25da1bfa769a43652e0b72991608979643 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Wed, 21 Dec 2005 12:26:25 -0500
Subject: [PATCH] --- yaml --- r: 15283 b: refs/heads/master c:
 d6f029130fb83b36fb709a187275b0494035d689 h: refs/heads/master i:   15281:
 e37373383c411604a39922c4c42adbd9fb36f721   15279:
 3c606b830f36b5ee34a7d26a90a7638623c70c0f v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/preempt.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0902e28aa685..0c6b52fe104a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5ea4e26602fa7f5141872f2c17a862f1974a73f
+refs/heads/master: d6f029130fb83b36fb709a187275b0494035d689
diff --git a/trunk/include/linux/preempt.h b/trunk/include/linux/preempt.h
index d9a2f5254a51..5769d14d1e6a 100644
--- a/trunk/include/linux/preempt.h
+++ b/trunk/include/linux/preempt.h
@@ -48,6 +48,7 @@ do { \
 #define preempt_enable() \
 do { \
 	preempt_enable_no_resched(); \
+	barrier(); \
 	preempt_check_resched(); \
 } while (0)