Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8818b671 authored by Richard Weinberger's avatar Richard Weinberger Committed by Linus Torvalds
Browse files

um: fix ptrace build error 



Both commits 0a3d763f ("ptrace: cleanup arch_ptrace() on um") and
9b05a69e ("ptrace: change signature of arch_ptrace()") broke the um
build.  This patch fixes the issues.

0a3d763f introduced the undeclared variable "datavp".  The patch seems
completely untested.  :-(

9b05a69e changed arch_ptrace()'s signature but did not update
um/include/asm/ptrace-generic.h.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Tested-by: default avatarWill Newton <will.newton@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6614b7b

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: {