diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-09-24 09:14:56 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-10-24 17:16:57 +0200 |
| commit | e258d719ff28ecc7a048eb8f78380e68c4b3a3f0 (patch) | |
| tree | 1c7f496b97cef1111b230371940e603a2ca401a4 /arch/s390/kernel/ptrace.c | |
| parent | 7d7c7b24e416afb2637be8447e03ca4457c100fd (diff) | |
| download | op-kernel-dev-e258d719ff28ecc7a048eb8f78380e68c4b3a3f0.zip op-kernel-dev-e258d719ff28ecc7a048eb8f78380e68c4b3a3f0.tar.gz | |
s390/uaccess: always run the kernel in home space
Simplify the uaccess code by removing the user_mode=home option.
The kernel will now always run in the home space mode.
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 9556905..e6abd5b 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c @@ -200,7 +200,7 @@ static unsigned long __peek_user(struct task_struct *child, addr_t addr) tmp = *(addr_t *)((addr_t) &task_pt_regs(child)->psw + addr); if (addr == (addr_t) &dummy->regs.psw.mask) /* Return a clean psw mask. */ - tmp = psw_user_bits | (tmp & PSW_MASK_USER); + tmp = PSW_USER_BITS | (tmp & PSW_MASK_USER); } else if (addr < (addr_t) &dummy->regs.orig_gpr2) { /* @@ -322,7 +322,7 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data) * psw and gprs are stored on the stack */ if (addr == (addr_t) &dummy->regs.psw.mask && - ((data & ~PSW_MASK_USER) != psw_user_bits || + ((data & ~PSW_MASK_USER) != PSW_USER_BITS || ((data & PSW_MASK_EA) && !(data & PSW_MASK_BA)))) /* Invalid psw mask. */ return -EINVAL; |
