From 90fe0e8ced5ebbdfd939c269f7e28c80a0e97929 Mon Sep 17 00:00:00 2001
From: chs <chs@NetBSD.org>
Date: Tue, 31 May 2005 16:10:47 +0000
Subject: [PATCH] avoid a shadow.

---
 sys/arch/hppa/hppa/fpu.c | 12 ++++++------
 sys/sys/systm.h          |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/arch/hppa/hppa/fpu.c b/sys/arch/hppa/hppa/fpu.c
index 8402a5d7d19f..40a9c8ce5979 100644
--- a/sys/arch/hppa/hppa/fpu.c
+++ b/sys/arch/hppa/hppa/fpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.9 2005/05/01 19:18:12 chs Exp $	*/
+/*	$NetBSD: fpu.c,v 1.10 2005/05/31 16:11:58 chs Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.9 2005/05/01 19:18:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.10 2005/05/31 16:11:58 chs Exp $");
 
 #include <sys/param.h>       
 #include <sys/systm.h>
@@ -147,7 +147,7 @@ void
 hppa_fpu_bootstrap(u_int ccr_enable)
 {
 	u_int32_t junk[2];
-	u_int32_t version[2];
+	u_int32_t vers[2];
 	extern u_int hppa_fpu_nop0;
 	extern u_int hppa_fpu_nop1;
 
@@ -188,7 +188,7 @@ hppa_fpu_bootstrap(u_int ccr_enable)
 			"	ldo	%1, %%r22	\n"
 			"	copr,0,0		\n"
 			"	fstds	%%fr0, 0(%%r22)	\n"
-			: "=m" (junk), "=m" (version) : : "r22");
+			: "=m" (junk), "=m" (vers) : : "r22");
 
 		/*
 		 * Now mark that no process has the FPU,
@@ -209,9 +209,9 @@ hppa_fpu_bootstrap(u_int ccr_enable)
 		 * proc0, we dispatch the copr,0,0 opcode 
 		 * into the emulator directly.  
 		 */
-		decode_0c(OPCODE_COPR_0_0, 0, 0, version);
+		decode_0c(OPCODE_COPR_0_0, 0, 0, vers);
 #endif /* FPEMUL */
-	fpu_version = version[0];
+	fpu_version = vers[0];
 }
 
 /*
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index a681a424c211..d5a283b1ca63 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: systm.h,v 1.177 2005/05/29 21:19:41 christos Exp $	*/
+/*	$NetBSD: systm.h,v 1.178 2005/05/31 16:10:47 chs Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
@@ -397,9 +397,9 @@ int cn_get_magic(char *, size_t);
 #define cn_check_magic(d, k, s)						\
 	do {								\
 		if (cn_isconsole(d)) {					\
-			int v = (s).cnm_magic[(s).cnm_state];		\
-			if ((k) == CNS_MAGIC_VAL(v)) {			\
-				(s).cnm_state = CNS_MAGIC_NEXT(v);	\
+			int _v = (s).cnm_magic[(s).cnm_state];		\
+			if ((k) == CNS_MAGIC_VAL(_v)) {			\
+				(s).cnm_state = CNS_MAGIC_NEXT(_v);	\
 				if ((s).cnm_state == CNS_TERM) {	\
 					cn_trap();			\
 					(s).cnm_state = 0;		\