diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /arch/x86/kernel/ptrace.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'arch/x86/kernel/ptrace.c')
| -rw-r--r-- | arch/x86/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 19378715f415..b7cc21bc6ae0 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
| @@ -1455,6 +1455,6 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs) | |||
| 1455 | * system call instruction. | 1455 | * system call instruction. |
| 1456 | */ | 1456 | */ |
| 1457 | if (test_thread_flag(TIF_SINGLESTEP) && | 1457 | if (test_thread_flag(TIF_SINGLESTEP) && |
| 1458 | tracehook_consider_fatal_signal(current, SIGTRAP, SIG_DFL)) | 1458 | tracehook_consider_fatal_signal(current, SIGTRAP)) |
| 1459 | send_sigtrap(current, regs, 0, TRAP_BRKPT); | 1459 | send_sigtrap(current, regs, 0, TRAP_BRKPT); |
| 1460 | } | 1460 | } |