Commit 3a709703 authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

ptrace: some checkpatch fixes



This fixes all the checkpatch --file complaints about kernel/ptrace.c
and also removes an unused #include.  I've verified that there are no
changes to the compiled code on x86_64.
Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
[ Removed the parts that just split a line  - Linus ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4c967291
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#include <linux/audit.h> #include <linux/audit.h>
#include <linux/pid_namespace.h> #include <linux/pid_namespace.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
/* /*
...@@ -48,7 +46,7 @@ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent) ...@@ -48,7 +46,7 @@ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent)
list_add(&child->ptrace_entry, &new_parent->ptraced); list_add(&child->ptrace_entry, &new_parent->ptraced);
child->parent = new_parent; child->parent = new_parent;
} }
/* /*
* Turn a tracing stop into a normal stop now, since with no tracer there * Turn a tracing stop into a normal stop now, since with no tracer there
* would be no way to wake it up with SIGCONT or SIGKILL. If there was a * would be no way to wake it up with SIGCONT or SIGKILL. If there was a
...@@ -173,7 +171,7 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode) ...@@ -173,7 +171,7 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
task_lock(task); task_lock(task);
err = __ptrace_may_access(task, mode); err = __ptrace_may_access(task, mode);
task_unlock(task); task_unlock(task);
return (!err ? true : false); return !err;
} }
int ptrace_attach(struct task_struct *task) int ptrace_attach(struct task_struct *task)
...@@ -358,7 +356,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst ...@@ -358,7 +356,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
copied += retval; copied += retval;
src += retval; src += retval;
dst += retval; dst += retval;
len -= retval; len -= retval;
} }
return copied; return copied;
} }
...@@ -383,7 +381,7 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds ...@@ -383,7 +381,7 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds
copied += retval; copied += retval;
src += retval; src += retval;
dst += retval; dst += retval;
len -= retval; len -= retval;
} }
return copied; return copied;
} }
...@@ -496,9 +494,9 @@ static int ptrace_resume(struct task_struct *child, long request, long data) ...@@ -496,9 +494,9 @@ static int ptrace_resume(struct task_struct *child, long request, long data)
if (unlikely(!arch_has_single_step())) if (unlikely(!arch_has_single_step()))
return -EIO; return -EIO;
user_enable_single_step(child); user_enable_single_step(child);
} } else {
else
user_disable_single_step(child); user_disable_single_step(child);
}
child->exit_code = data; child->exit_code = data;
wake_up_process(child); wake_up_process(child);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment