The patch titled utrace: uml: make UML compile with utrace enabled has been added to the -mm tree. Its filename is utrace-uml-make-uml-compile-with-utrace-enabled.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: utrace: uml: make UML compile with utrace enabled From: "Paolo 'Blaisorblade' Giarrusso" <blaisorblade@xxxxxxxx> * The prototype of arch_ptrace doesn't match the one in include/linux/ptrace.h. * utrace_um_native is referred to by utrace_native_view but never defined. Cc: Jeff Dike <jdike@xxxxxxxxxxx> Cc: Roland McGrath <roland@xxxxxxxxxx> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Cc: Roland McGrath <roland@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/kernel/ptrace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN arch/um/kernel/ptrace.c~utrace-uml-make-uml-compile-with-utrace-enabled arch/um/kernel/ptrace.c --- a/arch/um/kernel/ptrace.c~utrace-uml-make-uml-compile-with-utrace-enabled +++ a/arch/um/kernel/ptrace.c @@ -16,7 +16,12 @@ void ptrace_disable(struct task_struct * { } -long arch_ptrace(struct task_struct *child, long request, long addr, long data) +const struct utrace_regset_view utrace_um_native; + +int arch_ptrace(long *request, struct task_struct *child, + struct utrace_attached_engine *engine, + unsigned long addr, unsigned long data, + long *retval) { return -ENOSYS; } _ Patches currently in -mm which might be from blaisorblade@xxxxxxxx are origin.patch uml-fix-unreasonably-long-udelay.patch uml-delete-unused-code.patch uml-formatting-fixes.patch uml-host_info-tidying.patch uml-mark-tt-mode-code-for-future-removal.patch uml-print-coredump-limits.patch uml-handle-block-device-hotplug-errors.patch uml-driver-formatting-fixes.patch uml-driver-formatting-fixes-fix.patch uml-network-interface-hotplug-error-handling.patch uml-fix-prototypes.patch uml-move-sigio-testing-to-sigioc.patch uml-create-archh.patch uml-create-as-layouth.patch uml-move-remaining-useful-contents-of-user_utilh.patch uml-remove-user_utilh.patch uml-add-missing-__init-declarations.patch remove-unused-header-file-arch-um-kernel-tt-include-mode_kern-tth.patch uml-improve-checking-and-diagnostics-of-ethernet-macs.patch uml-eliminate-temporary-buffer-in-eth_configure.patch uml-replace-one-element-array-with-zero-element-array.patch uml-fix-umid-in-xterm-titles.patch uml-speed-up-exec.patch utrace-uml-make-uml-compile-with-utrace-enabled.patch git-gccbug.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