diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-10-30 15:16:48 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-10-30 15:16:43 +0100 |
| commit | ccf45cafb0805978e6f13a672caca0e536e87cad (patch) | |
| tree | f4abcadaf691ee952527ad434db3ab91b6e46e7f /arch/s390/kernel/signal.c | |
| parent | [S390] signal race with restarting system calls (diff) | |
| download | linux-ccf45cafb0805978e6f13a672caca0e536e87cad.tar.xz linux-ccf45cafb0805978e6f13a672caca0e536e87cad.zip | |
[S390] addressing mode limits and psw address wrapping
An instruction with an address right below the adress limit for the
current addressing mode will wrap. The instruction restart logic in
the protection fault handler and the signal code need to follow the
wrapping rules to find the correct instruction address.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/signal.c')
| -rw-r--r-- | arch/s390/kernel/signal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index e751cab80e04..058e372bada1 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c @@ -447,8 +447,9 @@ void do_signal(struct pt_regs *regs) /* fallthrough */ case -ERESTARTNOINTR: regs->gprs[2] = regs->orig_gpr2; - regs->psw.addr = regs->psw.addr - - (regs->svc_code >> 16); + regs->psw.addr = + __rewind_psw(regs->psw, + regs->svc_code >> 16); break; } /* No longer in a system call */ |