diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
| commit | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (patch) | |
| tree | c2db1b4958bbf617a25398b7ef93d82006b26a17 /include/linux/preempt.h | |
| parent | 292d4ed32e35df4755052b5002e533348d1648fd (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
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 d9a2f5254a51..5769d14d1e6a 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h | |||
| @@ -48,6 +48,7 @@ do { \ | |||
| 48 | #define preempt_enable() \ | 48 | #define preempt_enable() \ |
| 49 | do { \ | 49 | do { \ |
| 50 | preempt_enable_no_resched(); \ | 50 | preempt_enable_no_resched(); \ |
| 51 | barrier(); \ | ||
| 51 | preempt_check_resched(); \ | 52 | preempt_check_resched(); \ |
| 52 | } while (0) | 53 | } while (0) |
| 53 | 54 | ||