diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 18:18:01 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 18:18:01 +1100 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /include/linux/preempt.h | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
| download | kernel-crypto-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.gz kernel-crypto-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.xz kernel-crypto-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.zip | |
drm: merge in Linus mainline
Diffstat (limited to 'include/linux/preempt.h')
| -rw-r--r-- | include/linux/preempt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index dd98c54a23b..5769d14d1e6 100644 --- 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) |