um: fix ptrace build error (8818b671) · Commits · 戴 / test

Both commits ("ptrace: cleanup arch_ptrace() on um") and ("ptrace: change signature of arch_ptrace()") broke the um build. This patch fixes the issues. introduced the undeclared variable "datavp". The patch seems completely untested. :-( 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>

arch/um/include/asm/ptrace-generic.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,

arch/um/kernel/ptrace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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: {

Admin message