git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6-watchdog-mm
[pandora-kernel.git]
/
arch
/
s390
/
lib
/
uaccess_std.c
diff --git
a/arch/s390/lib/uaccess_std.c
b/arch/s390/lib/uaccess_std.c
index
bbaca66
..
56a0214
100644
(file)
--- a/
arch/s390/lib/uaccess_std.c
+++ b/
arch/s390/lib/uaccess_std.c
@@
-258,8
+258,6
@@
int futex_atomic_op(int op, int __user *uaddr, int oparg, int *old)
{
int oldval = 0, newval, ret;
- pagefault_disable();
-
switch (op) {
case FUTEX_OP_SET:
__futex_atomic_op("lr %2,%5\n",
@@
-284,7
+282,6
@@
int futex_atomic_op(int op, int __user *uaddr, int oparg, int *old)
default:
ret = -ENOSYS;
}
- pagefault_enable();
*old = oldval;
return ret;
}