diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-01-05 06:48:10 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-05 06:47:31 -0500 |
commit | 5e9a26928f550157563cfc06ce12c4ae121a02ec (patch) | |
tree | fc58668f8c6151a5f58c0430f92a0691d727af42 /arch/s390/mm/fault.c | |
parent | da7f51c11d5fedca9ba779ee220063ccb4f0a27e (diff) |
[S390] ptrace cleanup
Overhaul program event recording and the code dealing with the ptrace
user space interface.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm/fault.c')
-rw-r--r-- | arch/s390/mm/fault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index dccb85d91538..2c57806c0858 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c | |||
@@ -235,13 +235,13 @@ static noinline int signal_return(struct pt_regs *regs, long int_code, | |||
235 | rc = __get_user(instruction, (u16 __user *) regs->psw.addr); | 235 | rc = __get_user(instruction, (u16 __user *) regs->psw.addr); |
236 | 236 | ||
237 | if (!rc && instruction == 0x0a77) { | 237 | if (!rc && instruction == 0x0a77) { |
238 | clear_tsk_thread_flag(current, TIF_SINGLE_STEP); | 238 | clear_tsk_thread_flag(current, TIF_PER_TRAP); |
239 | if (is_compat_task()) | 239 | if (is_compat_task()) |
240 | sys32_sigreturn(); | 240 | sys32_sigreturn(); |
241 | else | 241 | else |
242 | sys_sigreturn(); | 242 | sys_sigreturn(); |
243 | } else if (!rc && instruction == 0x0aad) { | 243 | } else if (!rc && instruction == 0x0aad) { |
244 | clear_tsk_thread_flag(current, TIF_SINGLE_STEP); | 244 | clear_tsk_thread_flag(current, TIF_PER_TRAP); |
245 | if (is_compat_task()) | 245 | if (is_compat_task()) |
246 | sys32_rt_sigreturn(); | 246 | sys32_rt_sigreturn(); |
247 | else | 247 | else |
@@ -379,7 +379,7 @@ static inline int do_exception(struct pt_regs *regs, int access, | |||
379 | * The instruction that caused the program check will | 379 | * The instruction that caused the program check will |
380 | * be repeated. Don't signal single step via SIGTRAP. | 380 | * be repeated. Don't signal single step via SIGTRAP. |
381 | */ | 381 | */ |
382 | clear_tsk_thread_flag(tsk, TIF_SINGLE_STEP); | 382 | clear_tsk_thread_flag(tsk, TIF_PER_TRAP); |
383 | fault = 0; | 383 | fault = 0; |
384 | out_up: | 384 | out_up: |
385 | up_read(&mm->mmap_sem); | 385 | up_read(&mm->mmap_sem); |