Change the first argument of upeek from pid to tcp

All users were changed automatically by:

	for i in `git grep -l 'upeek(tcp->pid'`; do \
		sed -i 's/upeek(tcp->pid/upeek(tcp/g' "$i"; \
	done

* upeek.c (upeek): Change the first argument from pid_t pid to struct
tcb *tcp. Use tcp->pid instead of pid in the function's body.
* defs.h (upeek): Update declaration.
* linux/alpha/arch_getrval2.c: Pass tcp instead of tcp->pid to the
upeek calls.
* linux/alpha/arch_rt_sigframe.c: Likewise.
* linux/alpha/arch_sigreturn.c: Likewise.
* linux/alpha/get_scno.c: Likewise.
* linux/alpha/get_syscall_args.c: Likewise.
* linux/alpha/get_syscall_result.c: Likewise.
* linux/bfin/arch_rt_sigframe.c: Likewise.
* linux/bfin/get_scno.c: Likewise.
* linux/bfin/get_syscall_args.c: Likewise.
* linux/bfin/get_syscall_result.c: Likewise.
* linux/crisv10/arch_rt_sigframe.c: Likewise.
* linux/crisv10/get_scno.c: Likewise.
* linux/crisv10/get_syscall_args.c: Likewise.
* linux/crisv10/get_syscall_result.c: Likewise.
* linux/hppa/arch_rt_sigframe.c: Likewise.
* linux/hppa/get_scno.c: Likewise.
* linux/hppa/get_syscall_args.c: Likewise.
* linux/hppa/get_syscall_result.c: Likewise.
* linux/microblaze/arch_rt_sigframe.c: Likewise.
* linux/microblaze/arch_sigreturn.c: Likewise.
* linux/microblaze/get_scno.c: Likewise.
* linux/microblaze/get_syscall_args.c: Likewise.
* linux/microblaze/get_syscall_result.c: Likewise.
* linux/powerpc/getregs_old.c: Likewise.
* linux/sh/arch_getrval2.c: Likewise.
* linux/sh/arch_rt_sigframe.c: Likewise.
* linux/sh/get_scno.c: Likewise.
* linux/sh/get_syscall_args.c: Likewise.
* linux/sh/get_syscall_result.c: Likewise.
* linux/sh64/get_scno.c: Likewise.
* linux/sh64/get_syscall_args.c: Likewise.
* linux/sh64/get_syscall_result.c: Likewise.
* linux/xtensa/arch_rt_sigframe.c: Likewise.
* linux/xtensa/get_scno.c: Likewise.
* linux/xtensa/get_syscall_args.c: Likewise.
* linux/xtensa/get_syscall_result.c: Likewise.
* syscall.c: Likewise.

36 files changed, 42 insertions, 42 deletions

diff --git a/linux/alpha/arch_getrval2.c b/linux/alpha/arch_getrval2.c
index f78a9f0ff..795335229 100644
--- a/linux/alpha/arch_getrval2.c
+++ b/linux/alpha/arch_getrval2.c
@@ -2,7 +2,7 @@ long
 getrval2(struct tcb *tcp)
 {
 	unsigned long r20;
-	if (upeek(tcp->pid, 20, &r20) < 0)
+	if (upeek(tcp, 20, &r20) < 0)
 		return -1;
 	return r20;
 }
diff --git a/linux/alpha/arch_rt_sigframe.c b/linux/alpha/arch_rt_sigframe.c
index 3343183d8..d341be13d 100644
--- a/linux/alpha/arch_rt_sigframe.c
+++ b/linux/alpha/arch_rt_sigframe.c
@@ -29,5 +29,5 @@ FUNC_GET_RT_SIGFRAME_ADDR
 {
 	unsigned long addr;
 
-	return upeek(tcp->pid, REG_FP, &addr) ? 0 : addr;
+	return upeek(tcp, REG_FP, &addr) ? 0 : addr;
 }
diff --git a/linux/alpha/arch_sigreturn.c b/linux/alpha/arch_sigreturn.c
index d5f19c50d..396187ab8 100644
--- a/linux/alpha/arch_sigreturn.c
+++ b/linux/alpha/arch_sigreturn.c
@@ -3,7 +3,7 @@ arch_sigreturn(struct tcb *tcp)
 {
 	unsigned long addr;
 
-	if (upeek(tcp->pid, REG_FP, &addr) < 0)
+	if (upeek(tcp, REG_FP, &addr) < 0)
 		return;
 	addr += offsetof(struct sigcontext, sc_mask);
 
diff --git a/linux/alpha/get_scno.c b/linux/alpha/get_scno.c
index 3ffd78a62..3142da248 100644
--- a/linux/alpha/get_scno.c
+++ b/linux/alpha/get_scno.c
@@ -4,9 +4,9 @@ arch_get_scno(struct tcb *tcp)
 {
 	kernel_ulong_t scno = 0;
 
-	if (upeek(tcp->pid, REG_A3, &alpha_a3) < 0)
+	if (upeek(tcp, REG_A3, &alpha_a3) < 0)
 		return -1;
-	if (upeek(tcp->pid, REG_R0, &scno) < 0)
+	if (upeek(tcp, REG_R0, &scno) < 0)
 		return -1;
 
 	/*
diff --git a/linux/alpha/get_syscall_args.c b/linux/alpha/get_syscall_args.c
index a3857263d..be61abfaa 100644
--- a/linux/alpha/get_syscall_args.c
+++ b/linux/alpha/get_syscall_args.c
@@ -5,7 +5,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, REG_A0+i, &tcp->u_arg[i]) < 0)
+		if (upeek(tcp, REG_A0+i, &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
 }
diff --git a/linux/alpha/get_syscall_result.c b/linux/alpha/get_syscall_result.c
index f4c504f15..e49a8253d 100644
--- a/linux/alpha/get_syscall_result.c
+++ b/linux/alpha/get_syscall_result.c
@@ -1,6 +1,6 @@
 static int
 get_syscall_result_regs(struct tcb *tcp)
 {
-	return (upeek(tcp->pid, REG_A3, &alpha_a3) < 0 ||
-		upeek(tcp->pid, REG_R0, &alpha_r0) < 0) ? -1 : 0;
+	return (upeek(tcp, REG_A3, &alpha_a3) < 0 ||
+		upeek(tcp, REG_R0, &alpha_r0) < 0) ? -1 : 0;
 }
diff --git a/linux/bfin/arch_rt_sigframe.c b/linux/bfin/arch_rt_sigframe.c
index d84b83487..1692685c4 100644
--- a/linux/bfin/arch_rt_sigframe.c
+++ b/linux/bfin/arch_rt_sigframe.c
@@ -29,5 +29,5 @@ FUNC_GET_RT_SIGFRAME_ADDR
 {
 	unsigned long addr;
 
-	return upeek(tcp->pid, PT_USP, &addr) ? 0 : addr;
+	return upeek(tcp, PT_USP, &addr) ? 0 : addr;
 }
diff --git a/linux/bfin/get_scno.c b/linux/bfin/get_scno.c
index 8c3a7d216..c394889c5 100644
--- a/linux/bfin/get_scno.c
+++ b/linux/bfin/get_scno.c
@@ -2,5 +2,5 @@
 static int
 arch_get_scno(struct tcb *tcp)
 {
-	return upeek(tcp->pid, PT_ORIG_P0, &tcp->scno) < 0 ? -1 : 1;
+	return upeek(tcp, PT_ORIG_P0, &tcp->scno) < 0 ? -1 : 1;
 }
diff --git a/linux/bfin/get_syscall_args.c b/linux/bfin/get_syscall_args.c
index 69613d4e7..506d3a99b 100644
--- a/linux/bfin/get_syscall_args.c
+++ b/linux/bfin/get_syscall_args.c
@@ -8,7 +8,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, argreg[i], &tcp->u_arg[i]) < 0)
+		if (upeek(tcp, argreg[i], &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
 }
diff --git a/linux/bfin/get_syscall_result.c b/linux/bfin/get_syscall_result.c
index c189a5fd8..5c814b47d 100644
--- a/linux/bfin/get_syscall_result.c
+++ b/linux/bfin/get_syscall_result.c
@@ -1,5 +1,5 @@
 static int
 get_syscall_result_regs(struct tcb *tcp)
 {
-	return upeek(tcp->pid, PT_R0, &bfin_r0) < 0 ? -1 : 0;
+	return upeek(tcp, PT_R0, &bfin_r0) < 0 ? -1 : 0;
 }
diff --git a/linux/crisv10/arch_rt_sigframe.c b/linux/crisv10/arch_rt_sigframe.c
index f3d5f1080..e8f609e79 100644
--- a/linux/crisv10/arch_rt_sigframe.c
+++ b/linux/crisv10/arch_rt_sigframe.c
@@ -29,5 +29,5 @@ FUNC_GET_RT_SIGFRAME_ADDR
 {
 	unsigned long addr;
 
-	return upeek(tcp->pid, 4 * PT_USP, &addr) ? 0 : addr;
+	return upeek(tcp, 4 * PT_USP, &addr) ? 0 : addr;
 }
diff --git a/linux/crisv10/get_scno.c b/linux/crisv10/get_scno.c
index 14ff3386d..51db06a89 100644
--- a/linux/crisv10/get_scno.c
+++ b/linux/crisv10/get_scno.c
@@ -2,5 +2,5 @@
 static int
 arch_get_scno(struct tcb *tcp)
 {
-	return upeek(tcp->pid, 4 * PT_R9, &tcp->scno) < 0 ? -1 : 1;
+	return upeek(tcp, 4 * PT_R9, &tcp->scno) < 0 ? -1 : 1;
 }
diff --git a/linux/crisv10/get_syscall_args.c b/linux/crisv10/get_syscall_args.c
index bdd05746e..4af38d484 100644
--- a/linux/crisv10/get_syscall_args.c
+++ b/linux/crisv10/get_syscall_args.c
@@ -9,7 +9,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, crisregs[i], &tcp->u_arg[i]) < 0)
+		if (upeek(tcp, crisregs[i], &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
 }
diff --git a/linux/crisv10/get_syscall_result.c b/linux/crisv10/get_syscall_result.c
index 6b3679c15..675f3fdbd 100644
--- a/linux/crisv10/get_syscall_result.c
+++ b/linux/crisv10/get_syscall_result.c
@@ -1,5 +1,5 @@
 static int
 get_syscall_result_regs(struct tcb *tcp)
 {
-	return upeek(tcp->pid, 4 * PT_R10, &cris_r10) < 0 ? -1 : 0;
+	return upeek(tcp, 4 * PT_R10, &cris_r10) < 0 ? -1 : 0;
 }
diff --git a/linux/hppa/arch_rt_sigframe.c b/linux/hppa/arch_rt_sigframe.c
index e3c62fa51..aaf2ffe75 100644
--- a/linux/hppa/arch_rt_sigframe.c
+++ b/linux/hppa/arch_rt_sigframe.c
@@ -36,6 +36,6 @@ FUNC_GET_RT_SIGFRAME_ADDR
 {
 	unsigned long addr;
 
-	return upeek(tcp->pid, 4 * 30, &addr)
+	return upeek(tcp, 4 * 30, &addr)
 		? 0 : (addr & ~1UL) - RT_SIGFRAME_SIZE;
 }
diff --git a/linux/hppa/get_scno.c b/linux/hppa/get_scno.c
index 7da2fc403..fb3ed56bd 100644
--- a/linux/hppa/get_scno.c
+++ b/linux/hppa/get_scno.c
@@ -2,5 +2,5 @@
 static int
 arch_get_scno(struct tcb *tcp)
 {
-	return upeek(tcp->pid, PT_GR20, &tcp->scno) < 0 ? -1 : 1;
+	return upeek(tcp, PT_GR20, &tcp->scno) < 0 ? -1 : 1;
 }
diff --git a/linux/hppa/get_syscall_args.c b/linux/hppa/get_syscall_args.c
index 2258ea87c..aa938f509 100644
--- a/linux/hppa/get_syscall_args.c
+++ b/linux/hppa/get_syscall_args.c
@@ -5,7 +5,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, PT_GR26-4*i, &tcp->u_arg[i]) < 0)
+		if (upeek(tcp, PT_GR26-4*i, &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
 }
diff --git a/linux/hppa/get_syscall_result.c b/linux/hppa/get_syscall_result.c
index 0d15d4db7..de2b8829b 100644
--- a/linux/hppa/get_syscall_result.c
+++ b/linux/hppa/get_syscall_result.c
@@ -1,5 +1,5 @@
 static int
 get_syscall_result_regs(struct tcb *tcp)
 {
-	return upeek(tcp->pid, PT_GR28, &hppa_r28) < 0 ? -1 : 0;
+	return upeek(tcp, PT_GR28, &hppa_r28) < 0 ? -1 : 0;
 }
diff --git a/linux/microblaze/arch_rt_sigframe.c b/linux/microblaze/arch_rt_sigframe.c
index 10d03db61..dcecd1a40 100644
--- a/linux/microblaze/arch_rt_sigframe.c
+++ b/linux/microblaze/arch_rt_sigframe.c
@@ -29,5 +29,5 @@ FUNC_GET_RT_SIGFRAME_ADDR
 {
 	unsigned long addr;
 
-	return upeek(tcp->pid, 4 * 1, &addr) ? 0 : addr;
+	return upeek(tcp, 4 * 1, &addr) ? 0 : addr;
 }
diff --git a/linux/microblaze/arch_sigreturn.c b/linux/microblaze/arch_sigreturn.c
index 6e4343a80..27920734b 100644
--- a/linux/microblaze/arch_sigreturn.c
+++ b/linux/microblaze/arch_sigreturn.c
@@ -6,7 +6,7 @@ arch_sigreturn(struct tcb *tcp)
 	unsigned long addr;
 
 	/* Read r1, the stack pointer.  */
-	if (upeek(tcp->pid, 1 * 4, &addr) < 0)
+	if (upeek(tcp, 1 * 4, &addr) < 0)
 		return;
 	addr += offsetof(struct sigcontext, oldmask);
 
diff --git a/linux/microblaze/get_scno.c b/linux/microblaze/get_scno.c
index 6f98f834c..6c11cd447 100644
--- a/linux/microblaze/get_scno.c
+++ b/linux/microblaze/get_scno.c
@@ -2,5 +2,5 @@
 static int
 arch_get_scno(struct tcb *tcp)
 {
-	return upeek(tcp->pid, 0, &tcp->scno) < 0 ? -1 : 1;
+	return upeek(tcp, 0, &tcp->scno) < 0 ? -1 : 1;
 }
diff --git a/linux/microblaze/get_syscall_args.c b/linux/microblaze/get_syscall_args.c
index 830c8c321..1a3a48f97 100644
--- a/linux/microblaze/get_syscall_args.c
+++ b/linux/microblaze/get_syscall_args.c
@@ -5,7 +5,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, (5 + i) * 4, &tcp->u_arg[i]) < 0)
+		if (upeek(tcp, (5 + i) * 4, &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
 }
diff --git a/linux/microblaze/get_syscall_result.c b/linux/microblaze/get_syscall_result.c
index 9ece53e82..5b593a4a0 100644
--- a/linux/microblaze/get_syscall_result.c
+++ b/linux/microblaze/get_syscall_result.c
@@ -1,5 +1,5 @@
 static int
 get_syscall_result_regs(struct tcb *tcp)
 {
-	return upeek(tcp->pid, 3 * 4, &microblaze_r3) < 0 ? -1 : 0;
+	return upeek(tcp, 3 * 4, &microblaze_r3) < 0 ? -1 : 0;
 }
diff --git a/linux/powerpc/getregs_old.c b/linux/powerpc/getregs_old.c
index 61c418981..4485ca68b 100644
--- a/linux/powerpc/getregs_old.c
+++ b/linux/powerpc/getregs_old.c
@@ -9,23 +9,23 @@ getregs_old(struct tcb *tcp)
 	long r;
 
 	if (iflag) {
-		r = upeek(tcp->pid, sizeof(long) * PT_NIP, &ppc_regs.nip);
+		r = upeek(tcp, sizeof(long) * PT_NIP, &ppc_regs.nip);
 		if (r)
 			goto out;
 	}
 #ifdef POWERPC64 /* else we never use it */
-	r = upeek(tcp->pid, sizeof(long) * PT_MSR, &ppc_regs.msr);
+	r = upeek(tcp, sizeof(long) * PT_MSR, &ppc_regs.msr);
 	if (r)
 		goto out;
 #endif
-	r = upeek(tcp->pid, sizeof(long) * PT_CCR, &ppc_regs.ccr);
+	r = upeek(tcp, sizeof(long) * PT_CCR, &ppc_regs.ccr);
 	if (r)
 		goto out;
-	r = upeek(tcp->pid, sizeof(long) * PT_ORIG_R3, &ppc_regs.orig_gpr3);
+	r = upeek(tcp, sizeof(long) * PT_ORIG_R3, &ppc_regs.orig_gpr3);
 	if (r)
 		goto out;
 	for (i = 0; i <= 8; i++) {
-		r = upeek(tcp->pid, sizeof(long) * (PT_R0 + i),
+		r = upeek(tcp, sizeof(long) * (PT_R0 + i),
 			  &ppc_regs.gpr[i]);
 		if (r)
 			goto out;
diff --git a/linux/sh/arch_getrval2.c b/linux/sh/arch_getrval2.c
index 27b7cdd07..c00673191 100644
--- a/linux/sh/arch_getrval2.c
+++ b/linux/sh/arch_getrval2.c
@@ -2,7 +2,7 @@ long
 getrval2(struct tcb *tcp)
 {
 	unsigned long val;
-	if (upeek(tcp->pid, 4*(REG_REG0+1), &val) < 0)
+	if (upeek(tcp, 4*(REG_REG0+1), &val) < 0)
 		return -1;
 	return val;
 }
diff --git a/linux/sh/arch_rt_sigframe.c b/linux/sh/arch_rt_sigframe.c
index ae16e3f52..3c4f6f2bc 100644
--- a/linux/sh/arch_rt_sigframe.c
+++ b/linux/sh/arch_rt_sigframe.c
@@ -29,5 +29,5 @@ FUNC_GET_RT_SIGFRAME_ADDR
 {
 	unsigned long addr;
 
-	return upeek(tcp->pid, sizeof(long) * 15, &addr) ? 0 : addr;
+	return upeek(tcp, sizeof(long) * 15, &addr) ? 0 : addr;
 }
diff --git a/linux/sh/get_scno.c b/linux/sh/get_scno.c
index 45fc0b7b8..e89520de6 100644
--- a/linux/sh/get_scno.c
+++ b/linux/sh/get_scno.c
@@ -7,7 +7,7 @@ arch_get_scno(struct tcb *tcp)
 	/*
 	 * In the new syscall ABI, the system call number is in R3.
 	 */
-	if (upeek(tcp->pid, 4*(REG_REG0+3), &scno) < 0)
+	if (upeek(tcp, 4*(REG_REG0+3), &scno) < 0)
 		return -1;
 
 	if ((long) scno < 0) {
diff --git a/linux/sh/get_syscall_args.c b/linux/sh/get_syscall_args.c
index 0b6c8819d..b4ee1dd38 100644
--- a/linux/sh/get_syscall_args.c
+++ b/linux/sh/get_syscall_args.c
@@ -13,7 +13,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, syscall_regs[i], &tcp->u_arg[i]) < 0)
+		if (upeek(tcp, syscall_regs[i], &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
 }
diff --git a/linux/sh/get_syscall_result.c b/linux/sh/get_syscall_result.c
index f7b93b746..ff07a9860 100644
--- a/linux/sh/get_syscall_result.c
+++ b/linux/sh/get_syscall_result.c
@@ -2,5 +2,5 @@ static int
 get_syscall_result_regs(struct tcb *tcp)
 {
 	/* new syscall ABI returns result in R0 */
-	return upeek(tcp->pid, 4 * REG_REG0, &sh_r0) < 0 ? -1 : 0;
+	return upeek(tcp, 4 * REG_REG0, &sh_r0) < 0 ? -1 : 0;
 }
diff --git a/linux/sh64/get_scno.c b/linux/sh64/get_scno.c
index 50a52232a..bda2cd263 100644
--- a/linux/sh64/get_scno.c
+++ b/linux/sh64/get_scno.c
@@ -2,7 +2,7 @@
 static int
 arch_get_scno(struct tcb *tcp)
 {
-	if (upeek(tcp->pid, REG_SYSCALL, &tcp->scno) < 0)
+	if (upeek(tcp, REG_SYSCALL, &tcp->scno) < 0)
 		return -1;
 	tcp->scno &= 0xffff;
 	return 1;
diff --git a/linux/sh64/get_syscall_args.c b/linux/sh64/get_syscall_args.c
index 3970df8f7..e35c35074 100644
--- a/linux/sh64/get_syscall_args.c
+++ b/linux/sh64/get_syscall_args.c
@@ -7,7 +7,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, REG_GENERAL(syscall_regs[i]),
+		if (upeek(tcp, REG_GENERAL(syscall_regs[i]),
 			  &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
diff --git a/linux/sh64/get_syscall_result.c b/linux/sh64/get_syscall_result.c
index 4264dccc9..33c424794 100644
--- a/linux/sh64/get_syscall_result.c
+++ b/linux/sh64/get_syscall_result.c
@@ -2,5 +2,5 @@ static int
 get_syscall_result_regs(struct tcb *tcp)
 {
 	/* ABI defines result returned in r9 */
-	return upeek(tcp->pid, REG_GENERAL(9), &sh64_r9) < 0 ? -1 : 0;
+	return upeek(tcp, REG_GENERAL(9), &sh64_r9) < 0 ? -1 : 0;
 }
diff --git a/linux/xtensa/arch_rt_sigframe.c b/linux/xtensa/arch_rt_sigframe.c
index a40c76a5f..97ffe6cac 100644
--- a/linux/xtensa/arch_rt_sigframe.c
+++ b/linux/xtensa/arch_rt_sigframe.c
@@ -29,5 +29,5 @@ FUNC_GET_RT_SIGFRAME_ADDR
 {
 	unsigned long addr;
 
-	return upeek(tcp->pid, REG_A_BASE + 3, &addr) ? 0 : addr;
+	return upeek(tcp, REG_A_BASE + 3, &addr) ? 0 : addr;
 }
diff --git a/linux/xtensa/get_scno.c b/linux/xtensa/get_scno.c
index d230f73bd..854a27959 100644
--- a/linux/xtensa/get_scno.c
+++ b/linux/xtensa/get_scno.c
@@ -2,5 +2,5 @@
 static int
 arch_get_scno(struct tcb *tcp)
 {
-	return upeek(tcp->pid, SYSCALL_NR, &tcp->scno) < 0 ? -1 : 1;
+	return upeek(tcp, SYSCALL_NR, &tcp->scno) < 0 ? -1 : 1;
 }
diff --git a/linux/xtensa/get_syscall_args.c b/linux/xtensa/get_syscall_args.c
index a9c933a9f..2a20cdb1f 100644
--- a/linux/xtensa/get_syscall_args.c
+++ b/linux/xtensa/get_syscall_args.c
@@ -14,7 +14,7 @@ get_syscall_args(struct tcb *tcp)
 	unsigned int i;
 
 	for (i = 0; i < tcp->s_ent->nargs; ++i)
-		if (upeek(tcp->pid, xtensaregs[i], &tcp->u_arg[i]) < 0)
+		if (upeek(tcp, xtensaregs[i], &tcp->u_arg[i]) < 0)
 			return -1;
 	return 1;
 }
diff --git a/linux/xtensa/get_syscall_result.c b/linux/xtensa/get_syscall_result.c
index 51ad6deab..6eb513b80 100644
--- a/linux/xtensa/get_syscall_result.c
+++ b/linux/xtensa/get_syscall_result.c
@@ -1,5 +1,5 @@
 static int
 get_syscall_result_regs(struct tcb *tcp)
 {
-	return upeek(tcp->pid, REG_A_BASE + 2, &xtensa_a2) < 0 ? -1 : 0;
+	return upeek(tcp, REG_A_BASE + 2, &xtensa_a2) < 0 ? -1 : 0;
 }