diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-31 13:27:22 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-31 13:27:22 -0500 |
| commit | eea60caef610c7a6c58c0de9c80ae1e438e01301 (patch) | |
| tree | 25e19289bba003fe085e589430d0d981fd6b73a7 /include/linux/preempt.h | |
| parent | da8543ef125afc7bba4da526b61a1ae07dc25109 (diff) | |
| parent | 82c9df820112c6286a8e8fbe482e94b65b49062c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 | ||