diff options
author | Richard Weinberger <richard@nod.at> | 2010-11-11 14:05:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 07:55:30 -0800 |
commit | 8818b6719f1ecfdc1f27761704d0c9e2cbc48250 (patch) | |
tree | 826b9d39b3897cb0c45583c4f76723669d5b7349 /arch/um/include | |
parent | f6614b7bb405a9b35dd28baea989a749492c46b2 (diff) | |
download | kernel_samsung_smdk4412-8818b6719f1ecfdc1f27761704d0c9e2cbc48250.zip kernel_samsung_smdk4412-8818b6719f1ecfdc1f27761704d0c9e2cbc48250.tar.gz kernel_samsung_smdk4412-8818b6719f1ecfdc1f27761704d0c9e2cbc48250.tar.bz2 |
um: fix ptrace build error
Both commits 0a3d763f1a68 ("ptrace: cleanup arch_ptrace() on um") and
9b05a69e0534 ("ptrace: change signature of arch_ptrace()") broke the um
build. This patch fixes the issues.
0a3d763f1a68 introduced the undeclared variable "datavp". The patch seems
completely untested. :-(
9b05a69e0534 changed arch_ptrace()'s signature but did not update
um/include/asm/ptrace-generic.h.
Signed-off-by: Richard Weinberger <richard@nod.at>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Tested-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/asm/ptrace-generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h index 2cd899f..b7c5bab 100644 --- a/arch/um/include/asm/ptrace-generic.h +++ b/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, |