diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /include/asm-x86_64/futex.h | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'include/asm-x86_64/futex.h')
| -rw-r--r-- | include/asm-x86_64/futex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86_64/futex.h b/include/asm-x86_64/futex.h index 9804bf07b092..5cdfb08013c3 100644 --- a/include/asm-x86_64/futex.h +++ b/include/asm-x86_64/futex.h | |||
| @@ -55,7 +55,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) | |||
| 55 | if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int))) | 55 | if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int))) |
| 56 | return -EFAULT; | 56 | return -EFAULT; |
| 57 | 57 | ||
| 58 | inc_preempt_count(); | 58 | pagefault_disable(); |
| 59 | 59 | ||
| 60 | switch (op) { | 60 | switch (op) { |
| 61 | case FUTEX_OP_SET: | 61 | case FUTEX_OP_SET: |
| @@ -78,7 +78,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) | |||
| 78 | ret = -ENOSYS; | 78 | ret = -ENOSYS; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | dec_preempt_count(); | 81 | pagefault_enable(); |
| 82 | 82 | ||
| 83 | if (!ret) { | 83 | if (!ret) { |
| 84 | switch (cmp) { | 84 | switch (cmp) { |