Bah, I managed to turn cosmetic things into real bugs. Fix shadowed

variable declarations. :-(  Definately not my day today.

3 files changed, 22 insertions, 22 deletions

diff --git a/sys/alpha/alpha/sys_machdep.c b/sys/alpha/alpha/sys_machdep.c
index 0d9f5fe..7f6c270 100644
--- a/sys/alpha/alpha/sys_machdep.c
+++ b/sys/alpha/alpha/sys_machdep.c
@@ -170,7 +170,7 @@ alpha_set_uac(struct thread *td, char *args)
 	int error;
 	unsigned long uac;
 	struct proc *p;
-	struct thread *td;
+	struct thread *td2;
 
 	error = copyin(args, &uac, sizeof(uac));
 	if (error)
@@ -181,9 +181,9 @@ alpha_set_uac(struct thread *td, char *args)
 	if (p->p_pptr) {
 		PROC_LOCK(p->p_pptr);
 		/* XXXKSE which threads? */
-		td = FIRST_THREAD_IN_PROC(p->p_pptr);
-		td->td_md.md_flags &= ~MDP_UAC_MASK;
-		td->td_md.md_flags |= uac & MDP_UAC_MASK;
+		td2 = FIRST_THREAD_IN_PROC(p->p_pptr);
+		td2->td_md.md_flags &= ~MDP_UAC_MASK;
+		td2->td_md.md_flags |= uac & MDP_UAC_MASK;
 		PROC_UNLOCK(p->p_pptr);
 	}
 	PROC_UNLOCK(p);
@@ -194,7 +194,7 @@ static	int
 alpha_get_uac(struct thread *td, char *args)
 {
 	struct proc *p;
-	struct thread *td;
+	struct thread *td2;
 	int error;
 	unsigned long uac;
 
@@ -204,8 +204,8 @@ alpha_get_uac(struct thread *td, char *args)
 	if (p->p_pptr) {
 		PROC_LOCK(p->p_pptr);
 		/* XXXKSE which threads? */
-		td = FIRST_THREAD_IN_PROC(p->p_pptr);
-		uac = td->td_md.md_flags & MDP_UAC_MASK;
+		td2 = FIRST_THREAD_IN_PROC(p->p_pptr);
+		uac = td2->td_md.md_flags & MDP_UAC_MASK;
 		PROC_UNLOCK(p->p_pptr);
 		PROC_UNLOCK(p);
 		error = copyout(&uac, args, sizeof(uac));
diff --git a/sys/alpha/linux/linux_machdep.c b/sys/alpha/linux/linux_machdep.c
index 12a2160..51d68f1 100644
--- a/sys/alpha/linux/linux_machdep.c
+++ b/sys/alpha/linux/linux_machdep.c
@@ -127,7 +127,7 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
 {
 	int error, ff = RFPROC | RFSTOPPED;
 	struct proc *p2;
-	struct thread *td;
+	struct thread *td2;
 	int exit_signal;
 	vm_offset_t start;
 
@@ -167,8 +167,8 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
 	PROC_LOCK(p2);
 	p2->p_sigparent = exit_signal;
 	PROC_UNLOCK(p2);
-	td = FIRST_THREAD_IN_PROC(p2);
-	td->td_pcb->pcb_hw.apcb_usp = (unsigned long)args->stack;
+	td2 = FIRST_THREAD_IN_PROC(p2);
+	td2->td_pcb->pcb_hw.apcb_usp = (unsigned long)args->stack;
 
 #ifdef DEBUG
 	if (ldebug(clone))
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 68c226f..91ca6d1 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -263,7 +263,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 {
 	struct proc *curp = td->td_proc;
 	struct proc *p;
-	struct thread *td;
+	struct thread *td2;
 	struct iovec iov;
 	struct uio uio;
 	union {
@@ -379,13 +379,13 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 		return (EINVAL);
 	}
 
-	td = FIRST_THREAD_IN_PROC(p);
+	td2 = FIRST_THREAD_IN_PROC(p);
 	PROC_UNLOCK(p);
 #ifdef FIX_SSTEP
 	/*
 	 * Single step fixup ala procfs
 	 */
-	FIX_SSTEP(td);				/* XXXKSE */
+	FIX_SSTEP(td2);				/* XXXKSE */
 #endif
 
 	/*
@@ -427,7 +427,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 		PHOLD(p);
 
 		if (uap->req == PT_STEP) {
-			error = ptrace_single_step(td);
+			error = ptrace_single_step(td2);
 			if (error) {
 				PRELE(p);
 				return (error);
@@ -436,7 +436,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 
 		if (uap->addr != (caddr_t)1) {
 			fill_kinfo_proc(p, &p->p_uarea->u_kproc);
-			error = ptrace_set_pc(td,
+			error = ptrace_set_pc(td2,
 			    (u_long)(uintfptr_t)uap->addr);
 			if (error) {
 				PRELE(p);
@@ -476,7 +476,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 		mtx_lock_spin(&sched_lock);
 		if (p->p_stat == SSTOP) {
 			p->p_xstat = uap->data;
-			setrunnable(td); /* XXXKSE */
+			setrunnable(td2); /* XXXKSE */
 			mtx_unlock_spin(&sched_lock);
 		} else {
 			mtx_unlock_spin(&sched_lock);
@@ -529,7 +529,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 		error = copyin(uap->addr, &r.reg, sizeof r.reg);
 		if (error == 0) {
 			PHOLD(p);
-			error = proc_write_regs(td, &r.reg);
+			error = proc_write_regs(td2, &r.reg);
 			PRELE(p);
 		}
 		return (error);
@@ -538,7 +538,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 #ifdef PT_GETREGS
 	case PT_GETREGS:
 		PHOLD(p);
-		error = proc_read_regs(td, &r.reg);
+		error = proc_read_regs(td2, &r.reg);
 		PRELE(p);
 		if (error == 0)
 			error = copyout(&r.reg, uap->addr, sizeof r.reg);
@@ -550,7 +550,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 		error = copyin(uap->addr, &r.fpreg, sizeof r.fpreg);
 		if (error == 0) {
 			PHOLD(p);
-			error = proc_write_fpregs(td, &r.fpreg);
+			error = proc_write_fpregs(td2, &r.fpreg);
 			PRELE(p);
 		}
 		return (error);
@@ -559,7 +559,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 #ifdef PT_GETFPREGS
 	case PT_GETFPREGS:
 		PHOLD(p);
-		error = proc_read_fpregs(td, &r.fpreg);
+		error = proc_read_fpregs(td2, &r.fpreg);
 		PRELE(p);
 		if (error == 0)
 			error = copyout(&r.fpreg, uap->addr, sizeof r.fpreg);
@@ -571,7 +571,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 		error = copyin(uap->addr, &r.dbreg, sizeof r.dbreg);
 		if (error == 0) {
 			PHOLD(p);
-			error = proc_write_dbregs(td, &r.dbreg);
+			error = proc_write_dbregs(td2, &r.dbreg);
 			PRELE(p);
 		}
 		return (error);
@@ -580,7 +580,7 @@ ptrace(struct thread *td, struct ptrace_args *uap)
 #ifdef PT_GETDBREGS
 	case PT_GETDBREGS:
 		PHOLD(p);
-		error = proc_read_dbregs(td, &r.dbreg);
+		error = proc_read_dbregs(td2, &r.dbreg);
 		PRELE(p);
 		if (error == 0)
 			error = copyout(&r.dbreg, uap->addr, sizeof r.dbreg);