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)