diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 12:51:07 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 12:51:07 +0000 |
| commit | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (patch) | |
| tree | c2db1b4958bbf617a25398b7ef93d82006b26a17 /include/linux/preempt.h | |
| parent | 292d4ed32e35df4755052b5002e533348d1648fd (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
| download | kernel-crypto-d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b.tar.gz kernel-crypto-d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b.tar.xz kernel-crypto-d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/linux/preempt.h')
| -rw-r--r-- | include/linux/preempt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index d9a2f5254a5..5769d14d1e6 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -48,6 +48,7 @@ do { \ #define preempt_enable() \ do { \ preempt_enable_no_resched(); \ + barrier(); \ preempt_check_resched(); \ } while (0) |