diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /arch/s390/include/asm/ptrace.h | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/s390/include/asm/ptrace.h')
| -rw-r--r-- | arch/s390/include/asm/ptrace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h index af2c9ac28a07..a7226f8143fb 100644 --- a/arch/s390/include/asm/ptrace.h +++ b/arch/s390/include/asm/ptrace.h | |||
| @@ -490,6 +490,7 @@ extern void user_disable_single_step(struct task_struct *); | |||
| 490 | 490 | ||
| 491 | #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) | 491 | #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) |
| 492 | #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) | 492 | #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) |
| 493 | #define user_stack_pointer(regs)((regs)->gprs[15]) | ||
| 493 | #define regs_return_value(regs)((regs)->gprs[2]) | 494 | #define regs_return_value(regs)((regs)->gprs[2]) |
| 494 | #define profile_pc(regs) instruction_pointer(regs) | 495 | #define profile_pc(regs) instruction_pointer(regs) |
| 495 | extern void show_regs(struct pt_regs * regs); | 496 | extern void show_regs(struct pt_regs * regs); |