port-sparc/42249: Build failure in pmap.c for pure Sun4C config

[jarle%uninett.no@localhost]

>Number:         42249
>Category:       port-sparc
>Synopsis:       Build failure in pmap.c for pure Sun4C config
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    port-sparc-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Oct 30 12:50:00 +0000 2009
>Originator:     Jarle Greipsland
>Release:        NetBSD 5.99.21
>Organization:
        
>Environment:
        
        
System: NetBSD rigel.urc.uninett.no 4.99.19 NetBSD 4.99.19 (RIGEL) #0: Fri May 
11 18:37:17 CEST 2007  
jarle%rigel.urc.uninett.no@localhost:/usr/obj/sys/arch/sparc/compile/RIGEL sparc
Architecture: sparc
Machine: sparc
>Description:
Try and build a sparc kernel with only the stuff required by a Sun4C
system.  This fails with:

cc1: warnings being treated as errors
/external/usr/src/sys/arch/sparc/sparc/pmap.c: In function 'ctx_alloc':
/external/usr/src/sys/arch/sparc/sparc/pmap.c:2089: warning: unused variable 
'cpi'
/external/usr/src/sys/arch/sparc/sparc/pmap.c: In function 'ctx_free':
/external/usr/src/sys/arch/sparc/sparc/pmap.c:2256: warning: unused variable 
'cpi'
        
>How-To-Repeat:
Build -current kernel with custom config for Sun4C.
        
>Fix:
Apply patch:
Index: pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/pmap.c,v
retrieving revision 1.335
diff -u -r1.335 pmap.c
--- pmap.c      21 Oct 2009 21:12:02 -0000      1.335
+++ pmap.c      30 Oct 2009 12:39:51 -0000
@@ -2086,7 +2086,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
@@ -2253,7 +2255,9 @@
 ctx_free(struct pmap *pm)
 {
        union ctxinfo *c;
+#if defined(SUN4M) || defined(SUN4D)
        struct cpu_info *cpi;
+#endif
        int ctx;
 
        c = pm->pm_ctx;

>Unformatted: