diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2010-10-29 14:50:45 (GMT) |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-10-29 14:50:50 (GMT) |
| commit | 9ec2708053b647969bee862902872d44a5f9b439 (patch) | |
| tree | a7ca43a31a656bac010fac46d11ff0fa23488ef1 /arch/s390/kernel/entry64.S | |
| parent | f2166bb117952404689f0dc42624ee0b54a66e5e (diff) | |
| download | linux-9ec2708053b647969bee862902872d44a5f9b439.tar.xz | |
[S390] fix kprobes single stepping
Fix kprobes after git commit 1e54622e0403891b10f2105663e0f9dd595a1f17
broke it. The kprobe_handler is now called with interrupts in the state
at the time of the breakpoint. The single step of the replaced instruction
is done with interrupts off which makes it necessary to enable and disable
the interupts in the kprobes code.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/entry64.S')
| -rw-r--r-- | arch/s390/kernel/entry64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index a2be239..8f3e802 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S @@ -568,6 +568,7 @@ pgm_svcper: # per was called from kernel, must be kprobes # kernel_per: + REENABLE_IRQS xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number la %r2,SP_PTREGS(%r15) # address of register-save area brasl %r14,do_single_step |