git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
ptrace.c
diff --git
a/arch/sparc64/kernel/ptrace.c
b/arch/sparc64/kernel/ptrace.c
index
f6073b0
..
1e091dd
100644
(file)
--- a/
arch/sparc64/kernel/ptrace.c
+++ b/
arch/sparc64/kernel/ptrace.c
@@
-50,7
+50,7
@@
static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
}
static inline void
}
static inline void
-pt_succ_return_linux(struct pt_regs *regs, unsigned long value,
long
*addr)
+pt_succ_return_linux(struct pt_regs *regs, unsigned long value,
void __user
*addr)
{
if (test_thread_flag(TIF_32BIT)) {
if (put_user(value, (unsigned int __user *) addr)) {
{
if (test_thread_flag(TIF_32BIT)) {
if (put_user(value, (unsigned int __user *) addr)) {
@@
-70,7
+70,7
@@
pt_succ_return_linux(struct pt_regs *regs, unsigned long value, long *addr)
}
static void
}
static void
-pt_os_succ_return (struct pt_regs *regs, unsigned long val,
long
*addr)
+pt_os_succ_return (struct pt_regs *regs, unsigned long val,
void __user
*addr)
{
if (current->personality == PER_SUNOS)
pt_succ_return (regs, val);
{
if (current->personality == PER_SUNOS)
pt_succ_return (regs, val);
@@
-230,7
+230,7
@@
asmlinkage void do_ptrace(struct pt_regs *regs)
if (res < 0)
pt_error_return(regs, -res);
else
if (res < 0)
pt_error_return(regs, -res);
else
- pt_os_succ_return(regs, tmp64, (
long
*) data);
+ pt_os_succ_return(regs, tmp64, (
void __user
*) data);
goto flush_and_out;
}
goto flush_and_out;
}
@@
-563,7
+563,7
@@
asmlinkage void do_ptrace(struct pt_regs *regs)
* exit.
*/
case PTRACE_KILL: {
* exit.
*/
case PTRACE_KILL: {
- if (child->
state == TASK_ZOMBIE) {
/* already dead */
+ if (child->
exit_state == EXIT_ZOMBIE) {
/* already dead */
pt_succ_return(regs, 0);
goto out_tsk;
}
pt_succ_return(regs, 0);
goto out_tsk;
}