diff options
Diffstat (limited to 'arch/h8300/kernel/ptrace.c')
-rw-r--r-- | arch/h8300/kernel/ptrace.c | 52 |
1 files changed, 6 insertions, 46 deletions
diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c index 04bb9dd194ec..df114122ebdf 100644 --- a/arch/h8300/kernel/ptrace.c +++ b/arch/h8300/kernel/ptrace.c | |||
@@ -34,8 +34,11 @@ | |||
34 | /* cpu depend functions */ | 34 | /* cpu depend functions */ |
35 | extern long h8300_get_reg(struct task_struct *task, int regno); | 35 | extern long h8300_get_reg(struct task_struct *task, int regno); |
36 | extern int h8300_put_reg(struct task_struct *task, int regno, unsigned long data); | 36 | extern int h8300_put_reg(struct task_struct *task, int regno, unsigned long data); |
37 | extern void h8300_disable_trace(struct task_struct *child); | 37 | |
38 | extern void h8300_enable_trace(struct task_struct *child); | 38 | |
39 | void user_disable_single_step(struct task_struct *child) | ||
40 | { | ||
41 | } | ||
39 | 42 | ||
40 | /* | 43 | /* |
41 | * does not yet catch signals sent when the child dies. | 44 | * does not yet catch signals sent when the child dies. |
@@ -44,7 +47,7 @@ extern void h8300_enable_trace(struct task_struct *child); | |||
44 | 47 | ||
45 | void ptrace_disable(struct task_struct *child) | 48 | void ptrace_disable(struct task_struct *child) |
46 | { | 49 | { |
47 | h8300_disable_trace(child); | 50 | user_disable_single_step(child); |
48 | } | 51 | } |
49 | 52 | ||
50 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 53 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
@@ -107,49 +110,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
107 | } | 110 | } |
108 | ret = -EIO; | 111 | ret = -EIO; |
109 | break ; | 112 | break ; |
110 | case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ | ||
111 | case PTRACE_CONT: { /* restart after signal. */ | ||
112 | ret = -EIO; | ||
113 | if (!valid_signal(data)) | ||
114 | break ; | ||
115 | if (request == PTRACE_SYSCALL) | ||
116 | set_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
117 | else | ||
118 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
119 | child->exit_code = data; | ||
120 | wake_up_process(child); | ||
121 | /* make sure the single step bit is not set. */ | ||
122 | h8300_disable_trace(child); | ||
123 | ret = 0; | ||
124 | } | ||
125 | |||
126 | /* | ||
127 | * make the child exit. Best I can do is send it a sigkill. | ||
128 | * perhaps it should be put in the status that it wants to | ||
129 | * exit. | ||
130 | */ | ||
131 | case PTRACE_KILL: { | ||
132 | |||
133 | ret = 0; | ||
134 | if (child->exit_state == EXIT_ZOMBIE) /* already dead */ | ||
135 | break; | ||
136 | child->exit_code = SIGKILL; | ||
137 | h8300_disable_trace(child); | ||
138 | wake_up_process(child); | ||
139 | break; | ||
140 | } | ||
141 | |||
142 | case PTRACE_SINGLESTEP: { /* set the trap flag. */ | ||
143 | ret = -EIO; | ||
144 | if (!valid_signal(data)) | ||
145 | break; | ||
146 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
147 | child->exit_code = data; | ||
148 | h8300_enable_trace(child); | ||
149 | wake_up_process(child); | ||
150 | ret = 0; | ||
151 | break; | ||
152 | } | ||
153 | 113 | ||
154 | case PTRACE_GETREGS: { /* Get all gp regs from the child. */ | 114 | case PTRACE_GETREGS: { /* Get all gp regs from the child. */ |
155 | int i; | 115 | int i; |