From cc51beea5cc6977ca001f352aeb2fae029c41623 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Thu, 2 Aug 2012 09:11:23 +0200 Subject: [PATCH] --- yaml --- r: 321644 b: refs/heads/master c: 5ab37e1b226b7b40a44eea7d8d1fe19e67ff65a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/sys_s390.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e3be60d884fe..aecd8855a0fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c63cb468f373f479ff52b4a1b75f8ecdeaaf4f16 +refs/heads/master: 5ab37e1b226b7b40a44eea7d8d1fe19e67ff65a9 diff --git a/trunk/arch/s390/kernel/sys_s390.c b/trunk/arch/s390/kernel/sys_s390.c index b4a29eee41b8..d0964d22adb5 100644 --- a/trunk/arch/s390/kernel/sys_s390.c +++ b/trunk/arch/s390/kernel/sys_s390.c @@ -81,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; }