Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756694AbYCTQNl (ORCPT ); Thu, 20 Mar 2008 12:13:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752571AbYCTQNc (ORCPT ); Thu, 20 Mar 2008 12:13:32 -0400 Received: from mtagate4.de.ibm.com ([195.212.29.153]:14333 "EHLO mtagate4.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751697AbYCTQNb (ORCPT ); Thu, 20 Mar 2008 12:13:31 -0400 Subject: Please pull git390 'for-linus' branch From: Martin Schwidefsky Reply-To: schwidefsky@de.ibm.com To: torvalds@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Content-Type: text/plain Organization: IBM Corporation Date: Thu, 20 Mar 2008 17:13:04 +0100 Message-Id: <1206029584.23671.14.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1011 Lines: 32 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(¤t->mm->page_table_lock); uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); if (!uaddr) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/