diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-10-16 14:17:29 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-10-24 17:17:12 +0200 |
| commit | f26946d7ecad0afdd85e6ae56663d0fe26676b34 (patch) | |
| tree | ff4bb03205420d7600d9e2b35b2c5d2e38e716a7 /arch/s390/kernel/ptrace.c | |
| parent | 5ebf250dabbae83ad875f0dda5a108503cf78f3b (diff) | |
| download | op-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/kernel/ptrace.c')
| -rw-r--r-- | arch/s390/kernel/ptrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 1d1f9c3..e65c91c 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) | |
