summaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-10-16 14:17:29 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-10-24 17:17:12 +0200
commitf26946d7ecad0afdd85e6ae56663d0fe26676b34 (patch)
treeff4bb03205420d7600d9e2b35b2c5d2e38e716a7 /arch/s390/include
parent5ebf250dabbae83ad875f0dda5a108503cf78f3b (diff)
downloadop-kernel-dev-f26946d7ecad0afdd85e6ae56663d0fe26676b34.zip
op-kernel-dev-f26946d7ecad0afdd85e6ae56663d0fe26676b34.tar.gz
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>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/compat.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 7604cab..4bf9da0 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"
OpenPOWER on IntegriCloud