diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:48:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:48:49 -0700 |
| commit | 6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34 (patch) | |
| tree | b26de4b88337bc9ce18a7fa4492a0ac2ba5182b0 | |
| parent | ba422428295f19a3eef072b47c83202492ccab2f (diff) | |
| parent | 504e75d0ed3389747e40a4aaa4b1f4e569576665 (diff) | |
| download | blackbird-op-linux-6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34.tar.gz blackbird-op-linux-6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] futex: let futex_atomic_cmpxchg_pt survive early functional tests.
| -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) { int ret; + if (!current->mm) + return -EFAULT; spin_lock(¤t->mm->page_table_lock); uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); if (!uaddr) { |
