s390/compat: make psw32_user_bits a constant value again

Make psw32_user_bits a constant value again.
This is a leftover of the code which allowed to run the kernel either
in primary or home space which got removed with 9a905662 "s390/uaccess:
always run the kernel in home space".

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

4 files changed, 6 insertions, 8 deletions

diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 7604cabf02c0..4bf9da03591e 100644
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -36,7 +36,9 @@
 #define PSW32_ASC_SECONDARY     0x00008000UL
 #define PSW32_ASC_HOME          0x0000C000UL
 
-extern u32 psw32_user_bits;
+#define PSW32_USER_BITS (PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT | \
+                         PSW32_DEFAULT_KEY | PSW32_MASK_BASE | \
+                         PSW32_MASK_MCHECK | PSW32_MASK_PSTATE | PSW32_ASC_HOME)
 
 #define COMPAT_USER_HZ          100
 #define COMPAT_UTS_MACHINE      "s390\0\0\0\0"
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 1f1b8c70ab97..e030d2bdec1b 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -58,10 +58,6 @@
 
 #include "compat_linux.h"
 
-u32 psw32_user_bits = PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT |
-                      PSW32_DEFAULT_KEY | PSW32_MASK_BASE | PSW32_MASK_MCHECK |
-                      PSW32_MASK_PSTATE | PSW32_ASC_HOME;
- 
 /* For this source file, we want overflow handling. */
 
 #undef high2lowuid
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 8764c88a84fe..5a3ab5c191fd 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -158,7 +158,7 @@ static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs)
 
         user_sregs.regs.psw.mask = (__u32)(regs->psw.mask >> 32);
         user_sregs.regs.psw.mask &= PSW32_MASK_USER | PSW32_MASK_RI;
-        user_sregs.regs.psw.mask |= psw32_user_bits;
+        user_sregs.regs.psw.mask |= PSW32_USER_BITS;
         user_sregs.regs.psw.addr = (__u32) regs->psw.addr |
                 (__u32)(regs->psw.mask & PSW_MASK_BA);
         for (i = 0; i < NUM_GPRS; i++)
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 1d1f9c30c5fa..e65c91c591e8 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -563,7 +563,7 @@ static u32 __peek_user_compat(struct task_struct *child, addr_t addr)
                         /* Fake a 31 bit psw mask. */
                         tmp = (__u32)(regs->psw.mask >> 32);
                         tmp &= PSW32_MASK_USER | PSW32_MASK_RI;
-                        tmp |= psw32_user_bits;
+                        tmp |= PSW32_USER_BITS;
                 } else if (addr == (addr_t) &dummy32->regs.psw.addr) {
                         /* Fake a 31 bit psw address. */
                         tmp = (__u32) regs->psw.addr |
@@ -664,7 +664,7 @@ static int __poke_user_compat(struct task_struct *child,
 
                         mask |= is_ri_task(child) ? PSW32_MASK_RI : 0;
                         /* Build a 64 bit psw mask from 31 bit mask. */
-                        if ((tmp & ~mask) != psw32_user_bits)
+                        if ((tmp & ~mask) != PSW32_USER_BITS)
                                 /* Invalid psw mask. */
                                 return -EINVAL;
                         regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |