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 branch 'x86/amd-nb' into x86/apic-cleanups
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
ptrace.c
diff --git
a/arch/alpha/kernel/ptrace.c
b/arch/alpha/kernel/ptrace.c
index
baa9036
..
e2af5eb
100644
(file)
--- a/
arch/alpha/kernel/ptrace.c
+++ b/
arch/alpha/kernel/ptrace.c
@@
-269,7
+269,8
@@
void ptrace_disable(struct task_struct *child)
user_disable_single_step(child);
}
user_disable_single_step(child);
}
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request,
+ unsigned long addr, unsigned long data)
{
unsigned long tmp;
size_t copied;
{
unsigned long tmp;
size_t copied;
@@
-292,7
+293,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
case PTRACE_PEEKUSR:
force_successful_syscall_return();
ret = get_reg(child, addr);
case PTRACE_PEEKUSR:
force_successful_syscall_return();
ret = get_reg(child, addr);
- DBG(DBG_MEM, ("peek $%l
d
->%#lx\n", addr, ret));
+ DBG(DBG_MEM, ("peek $%l
u
->%#lx\n", addr, ret));
break;
/* When I and D space are separate, this will have to be fixed. */
break;
/* When I and D space are separate, this will have to be fixed. */
@@
-302,7
+303,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break;
case PTRACE_POKEUSR: /* write the specified register */
break;
case PTRACE_POKEUSR: /* write the specified register */
- DBG(DBG_MEM, ("poke $%l
d
<-%#lx\n", addr, data));
+ DBG(DBG_MEM, ("poke $%l
u
<-%#lx\n", addr, data));
ret = put_reg(child, addr, data);
break;
default:
ret = put_reg(child, addr, data);
break;
default: