2008-03-20 16:13:41

by Martin Schwidefsky

Subject: Please pull git390 'for-linus' branch

Please pull from 'for-linus' branch of

git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus

to receive the following updates:

arch/s390/lib/uaccess_pt.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

Heiko Carstens (1):
[S390] futex: let futex_atomic_cmpxchg_pt survive early functional tests.

diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 7e8efaa..5efdfe9 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(&current->mm->page_table_lock);
uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr);
if (!uaddr) {