From 90a628d5ec91f87d52c06508f5bb1324015225c2 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 11 Nov 2010 14:05:04 -0800 Subject: [PATCH] --- yaml --- r: 221710 b: refs/heads/master c: 8818b6719f1ecfdc1f27761704d0c9e2cbc48250 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/include/asm/ptrace-generic.h | 4 ++-- trunk/arch/um/kernel/ptrace.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5bfffa9760dc..0c51f27cd2d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6614b7bb405a9b35dd28baea989a749492c46b2 +refs/heads/master: 8818b6719f1ecfdc1f27761704d0c9e2cbc48250 diff --git a/trunk/arch/um/include/asm/ptrace-generic.h b/trunk/arch/um/include/asm/ptrace-generic.h index 2cd899f75a3c..b7c5bab9bd77 100644 --- a/trunk/arch/um/include/asm/ptrace-generic.h +++ b/trunk/arch/um/include/asm/ptrace-generic.h @@ -38,8 +38,8 @@ struct pt_regs { struct task_struct; -extern long subarch_ptrace(struct task_struct *child, long request, long addr, - long data); +extern long subarch_ptrace(struct task_struct *child, long request, + unsigned long addr, unsigned long data); extern unsigned long getreg(struct task_struct *child, int regno); extern int putreg(struct task_struct *child, int regno, unsigned long value); extern int get_fpregs(struct user_i387_struct __user *buf, diff --git a/trunk/arch/um/kernel/ptrace.c b/trunk/arch/um/kernel/ptrace.c index a5e33f29bbeb..701b672c1122 100644 --- a/trunk/arch/um/kernel/ptrace.c +++ b/trunk/arch/um/kernel/ptrace.c @@ -122,7 +122,7 @@ long arch_ptrace(struct task_struct *child, long request, break; case PTRACE_SET_THREAD_AREA: - ret = ptrace_set_thread_area(child, addr, datavp); + ret = ptrace_set_thread_area(child, addr, vp); break; case PTRACE_FAULTINFO: {