2 files changed, 4 insertions, 98 deletions
diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c
index 130dd214e41d..6cbd34a27b90 100644
--- a/arch/cris/arch-v10/kernel/ptrace.c
+++ b/arch/cris/arch-v10/kernel/ptrace.c
@@ -76,55 +76,11 @@ ptrace_disable(struct task_struct *child)
 * (in user space) where the result of the ptrace call is written (instead of
 * being returned).
 */
-asmlinkage int 
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
-sys_ptrace(long request, long pid, long addr, long data)
 {
-        struct task_struct *child;
        int ret;
        unsigned long __user *datap = (unsigned long __user *)data;
-        lock_kernel();
-        ret = -EPERM;
-        
-        if (request == PTRACE_TRACEME) {
-                /* are we already being traced? */
-                if (current->ptrace & PT_PTRACED)
-                        goto out;
-                ret = security_ptrace(current->parent, current);
-                if (ret)
-                        goto out;
-                /* set the ptrace bit in the process flags. */
-                current->ptrace |= PT_PTRACED;
-                ret = 0;
-                goto out;
-        }
-        
-        ret = -ESRCH;
-        read_lock(&tasklist_lock);
-        child = find_task_by_pid(pid);
-        
-        if (child)
-                get_task_struct(child);
-        
-        read_unlock(&tasklist_lock);
-        
-        if (!child)
-                goto out;
-        
-        ret = -EPERM;
-        
-        if (pid == 1)           /* Leave the init process alone! */
-                goto out_tsk;
-        
-        if (request == PTRACE_ATTACH) {
-                ret = ptrace_attach(child);
-                goto out_tsk;
-        }
-        
-        ret = ptrace_check_attach(child, request == PTRACE_KILL);
-        if (ret < 0)
-                goto out_tsk;
        switch (request) {
                /* Read word at location address. */ 
                case PTRACE_PEEKTEXT:
@@ -289,10 +245,7 @@ sys_ptrace(long request, long pid, long addr, long data)
                        ret = ptrace_request(child, request, addr, data);
                        break;
        }
-out_tsk:
-        put_task_struct(child);
-out:
-        unlock_kernel();
        return ret;
 }
diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c
index 208489da2a87..5528b83a622b 100644
--- a/arch/cris/arch-v32/kernel/ptrace.c
+++ b/arch/cris/arch-v32/kernel/ptrace.c
@@ -99,55 +99,11 @@ ptrace_disable(struct task_struct *child)
 }
-asmlinkage int
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
-sys_ptrace(long request, long pid, long addr, long data)
 {
-        struct task_struct *child;
        int ret;
        unsigned long __user *datap = (unsigned long __user *)data;
-        lock_kernel();
-        ret = -EPERM;
-        if (request == PTRACE_TRACEME) {
-                /* are we already being traced? */
-                if (current->ptrace & PT_PTRACED)
-                        goto out;
-                ret = security_ptrace(current->parent, current);
-                if (ret)
-                        goto out;
-                /* set the ptrace bit in the process flags. */
-                current->ptrace |= PT_PTRACED;
-                ret = 0;
-                goto out;
-        }
-        ret = -ESRCH;
-        read_lock(&tasklist_lock);
-        child = find_task_by_pid(pid);
-        if (child)
-                get_task_struct(child);
-        read_unlock(&tasklist_lock);
-        if (!child)
-                goto out;
-        ret = -EPERM;
-        if (pid == 1)           /* Leave the init process alone! */
-                goto out_tsk;
-        if (request == PTRACE_ATTACH) {
-                ret = ptrace_attach(child);
-                goto out_tsk;
-        }
-        ret = ptrace_check_attach(child, request == PTRACE_KILL);
-        if (ret < 0)
-                goto out_tsk;
        switch (request) {
                /* Read word at location address. */
                case PTRACE_PEEKTEXT:
@@ -347,10 +303,7 @@ sys_ptrace(long request, long pid, long addr, long data)
                        ret = ptrace_request(child, request, addr, data);
                        break;
        }
-out_tsk:
-        put_task_struct(child);
-out:
-        unlock_kernel();
        return ret;
 }

diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c index 130dd214e41d..6cbd34a27b90 100644 --- a/arch/cris/arch-v10/kernel/ptrace.c +++ b/arch/cris/arch-v10/kernel/ptrace.c
@@ -76,55 +76,11 @@ ptrace_disable(struct task_struct *child)
76	* (in user space) where the result of the ptrace call is written (instead of	76	* (in user space) where the result of the ptrace call is written (instead of
77	* being returned).	77	* being returned).
78	*/	78	*/
79	asmlinkage int	79	long arch_ptrace(struct task_struct *child, long request, long addr, long data)
80	sys_ptrace(long request, long pid, long addr, long data)
81	{	80	{
82	struct task_struct *child;
83	int ret;	81	int ret;
84	unsigned long __user datap = (unsigned long __user )data;	82	unsigned long __user datap = (unsigned long __user )data;
85		83
86	lock_kernel();
87	ret = -EPERM;
88
89	if (request == PTRACE_TRACEME) {
90	/* are we already being traced? */
91	if (current->ptrace & PT_PTRACED)
92	goto out;
93	ret = security_ptrace(current->parent, current);
94	if (ret)
95	goto out;
96	/* set the ptrace bit in the process flags. */
97	current->ptrace \|= PT_PTRACED;
98	ret = 0;
99	goto out;
100	}
101
102	ret = -ESRCH;
103	read_lock(&tasklist_lock);
104	child = find_task_by_pid(pid);
105
106	if (child)
107	get_task_struct(child);
108
109	read_unlock(&tasklist_lock);
110
111	if (!child)
112	goto out;
113
114	ret = -EPERM;
115
116	if (pid == 1) /* Leave the init process alone! */
117	goto out_tsk;
118
119	if (request == PTRACE_ATTACH) {
120	ret = ptrace_attach(child);
121	goto out_tsk;
122	}
123
124	ret = ptrace_check_attach(child, request == PTRACE_KILL);
125	if (ret < 0)
126	goto out_tsk;
127
128	switch (request) {	84	switch (request) {
129	/* Read word at location address. */	85	/* Read word at location address. */
130	case PTRACE_PEEKTEXT:	86	case PTRACE_PEEKTEXT:
@@ -289,10 +245,7 @@ sys_ptrace(long request, long pid, long addr, long data)
289	ret = ptrace_request(child, request, addr, data);	245	ret = ptrace_request(child, request, addr, data);
290	break;	246	break;
291	}	247	}
292	out_tsk:	248
293	put_task_struct(child);
294	out:
295	unlock_kernel();
296	return ret;	249	return ret;
297	}	250	}
298		251


diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c index 208489da2a87..5528b83a622b 100644 --- a/arch/cris/arch-v32/kernel/ptrace.c +++ b/arch/cris/arch-v32/kernel/ptrace.c
@@ -99,55 +99,11 @@ ptrace_disable(struct task_struct *child)
99	}	99	}
100		100
101		101
102	asmlinkage int	102	long arch_ptrace(struct task_struct *child, long request, long addr, long data)
103	sys_ptrace(long request, long pid, long addr, long data)
104	{	103	{
105	struct task_struct *child;
106	int ret;	104	int ret;
107	unsigned long __user datap = (unsigned long __user )data;	105	unsigned long __user datap = (unsigned long __user )data;
108		106
109	lock_kernel();
110	ret = -EPERM;
111
112	if (request == PTRACE_TRACEME) {
113	/* are we already being traced? */
114	if (current->ptrace & PT_PTRACED)
115	goto out;
116	ret = security_ptrace(current->parent, current);
117	if (ret)
118	goto out;
119	/* set the ptrace bit in the process flags. */
120	current->ptrace \|= PT_PTRACED;
121	ret = 0;
122	goto out;
123	}
124
125	ret = -ESRCH;
126	read_lock(&tasklist_lock);
127	child = find_task_by_pid(pid);
128
129	if (child)
130	get_task_struct(child);
131
132	read_unlock(&tasklist_lock);
133
134	if (!child)
135	goto out;
136
137	ret = -EPERM;
138
139	if (pid == 1) /* Leave the init process alone! */
140	goto out_tsk;
141
142	if (request == PTRACE_ATTACH) {
143	ret = ptrace_attach(child);
144	goto out_tsk;
145	}
146
147	ret = ptrace_check_attach(child, request == PTRACE_KILL);
148	if (ret < 0)
149	goto out_tsk;
150
151	switch (request) {	107	switch (request) {
152	/* Read word at location address. */	108	/* Read word at location address. */
153	case PTRACE_PEEKTEXT:	109	case PTRACE_PEEKTEXT:
@@ -347,10 +303,7 @@ sys_ptrace(long request, long pid, long addr, long data)
347	ret = ptrace_request(child, request, addr, data);	303	ret = ptrace_request(child, request, addr, data);
348	break;	304	break;
349	}	305	}
350	out_tsk:	306
351	put_task_struct(child);
352	out:
353	unlock_kernel();
354	return ret;	307	return ret;
355	}	308	}
356		309