git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
ptrace.c
diff --git
a/arch/ia64/kernel/ptrace.c
b/arch/ia64/kernel/ptrace.c
index
7c7909f
..
8848f43
100644
(file)
--- a/
arch/ia64/kernel/ptrace.c
+++ b/
arch/ia64/kernel/ptrace.c
@@
-1177,7
+1177,8
@@
ptrace_disable (struct task_struct *child)
}
long
-arch_ptrace (struct task_struct *child, long request, long addr, long data)
+arch_ptrace (struct task_struct *child, long request,
+ unsigned long addr, unsigned long data)
{
switch (request) {
case PTRACE_PEEKTEXT: