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-ia64/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-ia64/futex.h')
| -rw-r--r-- | include/asm-ia64/futex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/futex.h b/include/asm-ia64/futex.h index 07d77f3a8cbe..8a98a2654139 100644 --- a/include/asm-ia64/futex.h +++ b/include/asm-ia64/futex.h | |||
| @@ -59,7 +59,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) | |||
| 59 | if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int))) | 59 | if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int))) |
| 60 | return -EFAULT; | 60 | return -EFAULT; |
| 61 | 61 | ||
| 62 | inc_preempt_count(); | 62 | pagefault_disable(); |
| 63 | 63 | ||
| 64 | switch (op) { | 64 | switch (op) { |
| 65 | case FUTEX_OP_SET: | 65 | case FUTEX_OP_SET: |
| @@ -83,7 +83,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) | |||
| 83 | ret = -ENOSYS; | 83 | ret = -ENOSYS; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | dec_preempt_count(); | 86 | pagefault_enable(); |
| 87 | 87 | ||
| 88 | if (!ret) { | 88 | if (!ret) { |
| 89 | switch (cmp) { | 89 | switch (cmp) { |