Module Name: src
Committed By: snj
Date: Sun Nov 15 05:58:38 UTC 2009
Modified Files:
src/sys/arch/sparc/sparc [netbsd-5]: pmap.c
Log Message:
Pull up following revision(s) (requested by jdc in ticket #1138):
sys/arch/sparc/sparc/pmap.c: revision 1.336
Avoid unused variable warnings on Sun4c-only kernels.
Fix applied from PR#42249 -- thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.322.20.1 -r1.322.20.2 src/sys/arch/sparc/sparc/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.322.20.1 src/sys/arch/sparc/sparc/pmap.c:1.322.20.2
--- src/sys/arch/sparc/sparc/pmap.c:1.322.20.1 Sat May 30 16:57:18 2009
+++ src/sys/arch/sparc/sparc/pmap.c Sun Nov 15 05:58:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.322.20.1 2009/05/30 16:57:18 snj Exp $ */
+/* $NetBSD: pmap.c,v 1.322.20.2 2009/11/15 05:58:38 snj Exp $ */
/*
* Copyright (c) 1996
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.322.20.1 2009/05/30 16:57:18 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.322.20.2 2009/11/15 05:58:38 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -2061,7 +2061,9 @@
struct regmap *rp;
int gap_start, gap_end;
vaddr_t va;
+#if defined(SUN4M) || defined(SUN4D)
struct cpu_info *cpi;
+#endif
/*XXX-GCC!*/gap_start=gap_end=0;
#ifdef DEBUG
@@ -2228,8 +2230,10 @@
ctx_free(struct pmap *pm)
{
union ctxinfo *c;
- struct cpu_info *cpi;
int ctx;
+#if defined(SUN4M) || defined(SUN4D)
+ struct cpu_info *cpi;
+#endif
c = pm->pm_ctx;
ctx = pm->pm_ctxnum;
