From 6ed03a14672695cd6e67b9f957ff2b4cc7284526 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 30 Jan 2008 13:30:48 +0100 Subject: [PATCH] --- yaml --- r: 79867 b: refs/heads/master c: 7f232343e0ea37ffc0a552cdbd4825482c949281 h: refs/heads/master i: 79865: aed5f7c292e8f430c6da05e0c71c86890a6374c6 79863: c43e0ae1db16a6d9878dd6e9007129f517191fa7 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/ptrace_32.c | 12 ++++++------ trunk/arch/x86/kernel/ptrace_64.c | 12 ++++++------ trunk/include/asm-x86/ptrace.h | 7 +++++++ 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index fe4a7175022d..203781d3e8a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77c03dcd448aa4c7be45f4edb97381ef463e3911 +refs/heads/master: 7f232343e0ea37ffc0a552cdbd4825482c949281 diff --git a/trunk/arch/x86/kernel/ptrace_32.c b/trunk/arch/x86/kernel/ptrace_32.c index 4619bda470b6..1402a54ef61f 100644 --- a/trunk/arch/x86/kernel/ptrace_32.c +++ b/trunk/arch/x86/kernel/ptrace_32.c @@ -218,7 +218,7 @@ static inline int is_setting_trap_flag(struct task_struct *child, struct pt_regs return 0; } -static void set_singlestep(struct task_struct *child) +void user_enable_single_step(struct task_struct *child) { struct pt_regs *regs = get_child_regs(child); @@ -249,7 +249,7 @@ static void set_singlestep(struct task_struct *child) child->ptrace |= PT_DTRACE; } -static void clear_singlestep(struct task_struct *child) +void user_disable_single_step(struct task_struct *child) { /* Always clear TIF_SINGLESTEP... */ clear_tsk_thread_flag(child, TIF_SINGLESTEP); @@ -269,7 +269,7 @@ static void clear_singlestep(struct task_struct *child) */ void ptrace_disable(struct task_struct *child) { - clear_singlestep(child); + user_disable_single_step(child); clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); } @@ -403,7 +403,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) } child->exit_code = data; /* make sure the single step bit is not set. */ - clear_singlestep(child); + user_disable_single_step(child); wake_up_process(child); ret = 0; break; @@ -419,7 +419,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) break; child->exit_code = SIGKILL; /* make sure the single step bit is not set. */ - clear_singlestep(child); + user_disable_single_step(child); wake_up_process(child); break; @@ -435,7 +435,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); - set_singlestep(child); + user_enable_single_step(child); child->exit_code = data; /* give it a chance to run. */ wake_up_process(child); diff --git a/trunk/arch/x86/kernel/ptrace_64.c b/trunk/arch/x86/kernel/ptrace_64.c index 8e433b3773d2..7373a99facf3 100644 --- a/trunk/arch/x86/kernel/ptrace_64.c +++ b/trunk/arch/x86/kernel/ptrace_64.c @@ -170,7 +170,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs) return 0; } -static void set_singlestep(struct task_struct *child) +void user_enable_single_step(struct task_struct *child) { struct pt_regs *regs = task_pt_regs(child); @@ -201,7 +201,7 @@ static void set_singlestep(struct task_struct *child) child->ptrace |= PT_DTRACE; } -static void clear_singlestep(struct task_struct *child) +void user_disable_single_step(struct task_struct *child) { /* Always clear TIF_SINGLESTEP... */ clear_tsk_thread_flag(child, TIF_SINGLESTEP); @@ -221,7 +221,7 @@ static void clear_singlestep(struct task_struct *child) */ void ptrace_disable(struct task_struct *child) { - clear_singlestep(child); + user_disable_single_step(child); } static int putreg(struct task_struct *child, @@ -461,7 +461,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) clear_tsk_thread_flag(child, TIF_SINGLESTEP); child->exit_code = data; /* make sure the single step bit is not set. */ - clear_singlestep(child); + user_disable_single_step(child); wake_up_process(child); ret = 0; break; @@ -504,7 +504,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) clear_tsk_thread_flag(child, TIF_SINGLESTEP); child->exit_code = SIGKILL; /* make sure the single step bit is not set. */ - clear_singlestep(child); + user_disable_single_step(child); wake_up_process(child); break; @@ -513,7 +513,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) if (!valid_signal(data)) break; clear_tsk_thread_flag(child,TIF_SYSCALL_TRACE); - set_singlestep(child); + user_enable_single_step(child); child->exit_code = data; /* give it a chance to run. */ wake_up_process(child); diff --git a/trunk/include/asm-x86/ptrace.h b/trunk/include/asm-x86/ptrace.h index 105d1534eaf4..fe75422f034b 100644 --- a/trunk/include/asm-x86/ptrace.h +++ b/trunk/include/asm-x86/ptrace.h @@ -140,6 +140,13 @@ enum { #ifdef __KERNEL__ +/* + * These are defined as per linux/ptrace.h, which see. + */ +#define arch_has_single_step() (1) +extern void user_enable_single_step(struct task_struct *); +extern void user_disable_single_step(struct task_struct *); + struct user_desc; extern int do_get_thread_area(struct task_struct *p, int idx, struct user_desc __user *info);