The patch titled
um: fix ptrace build error
has been added to the -mm tree. Its filename is
um-fix-ptrace-build-error.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: um: fix ptrace build error
From: Richard Weinberger <richard@xxxxxx>
Both 0a3d763 ("ptrace: cleanup arch_ptrace() on um") and 9b05a69 ("ptrace:
change signature of arch_ptrace()") broke the um build. This patch fixes
the issues.
0a3d763 introduced the undeclared variable "datavp". The patch seems
completely untested. :-(
9b05a69 changed arch_ptrace()'s signature but did not update
um/include/asm/ptrace-generic.h.
Signed-off-by: Richard Weinberger <richard@xxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/include/asm/ptrace-generic.h | 4 ++--
arch/um/kernel/ptrace.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/um/include/asm/ptrace-generic.h~um-fix-ptrace-build-error arch/um/include/asm/ptrace-generic.h
--- a/arch/um/include/asm/ptrace-generic.h~um-fix-ptrace-build-error
+++ a/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 -puN arch/um/kernel/ptrace.c~um-fix-ptrace-build-error arch/um/kernel/ptrace.c
--- a/arch/um/kernel/ptrace.c~um-fix-ptrace-build-error
+++ a/arch/um/kernel/ptrace.c
@@ -122,7 +122,7 @@ long arch_ptrace(struct task_struct *chi
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: {
_
Patches currently in -mm which might be from richard@xxxxxx are
origin.patch
um-fix-ptrace-build-error.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
