diff options
Diffstat (limited to 'arch/s390/kernel/sys_s390.c')
| -rw-r--r-- | arch/s390/kernel/sys_s390.c | 13 | 
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 78ea1948ff51..d0964d22adb5 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -1,8 +1,6 @@  /* - *  arch/s390/kernel/sys_s390.c - *   *  S390 version - *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation + *    Copyright IBM Corp. 1999, 2000   *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),   *               Thomas Spatzier (tspat@de.ibm.com)   * @@ -83,11 +81,12 @@ SYSCALL_DEFINE1(s390_personality, unsigned int, personality)  {  	unsigned int ret; -	if (current->personality == PER_LINUX32 && personality == PER_LINUX) -		personality = PER_LINUX32; +	if (personality(current->personality) == PER_LINUX32 && +	    personality(personality) == PER_LINUX) +		personality |= PER_LINUX32;  	ret = sys_personality(personality); -	if (ret == PER_LINUX32) -		ret = PER_LINUX; +	if (personality(ret) == PER_LINUX32) +		ret &= ~PER_LINUX32;  	return ret;  }  | 
