diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /arch/s390 | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/lib/uaccess_pt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c index 7e8efaade2ea..5efdfe9f5e76 100644 --- a/arch/s390/lib/uaccess_pt.c +++ b/arch/s390/lib/uaccess_pt.c | |||
| @@ -406,6 +406,8 @@ int futex_atomic_cmpxchg_pt(int __user *uaddr, int oldval, int newval) | |||
| 406 | { | 406 | { |
| 407 | int ret; | 407 | int ret; |
| 408 | 408 | ||
| 409 | if (!current->mm) | ||
| 410 | return -EFAULT; | ||
| 409 | spin_lock(¤t->mm->page_table_lock); | 411 | spin_lock(¤t->mm->page_table_lock); |
| 410 | uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); | 412 | uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); |
| 411 | if (!uaddr) { | 413 | if (!uaddr) { |