Somebody please commit these so I can stop shipping them with each snapshot:

The first diff allows netboot to build, fixing a PR of Manuel's (IIRC).

The second allows sun3x kernels to build, because somebody added a 'flags'
argument to pmap_enter which conflicts with the pre-existing 'flags' local
variable, which I rename to 'mapflags' in the diff.

TIA

Index: sys/arch/sun3/stand/libsa/Makefile
===================================================================
RCS file: /data/anoncvs/main/syssrc/sys/arch/sun3/stand/libsa/Makefile,v
retrieving revision 1.21
diff -r1.21 Makefile
30c30,31
< SRC_kern= ashrdi3.c bcmp.c bzero.c strcmp.c strlen.c strncmp.c
---
> SRC_kern= ashrdi3.c bcmp.c bzero.c inet_addr.c intoa.c \
> 	strcmp.c strlen.c strncmp.c
Index: sys/arch/sun3/sun3x/pmap.c
===================================================================
RCS file: /data/anoncvs/main/syssrc/sys/arch/sun3/sun3x/pmap.c,v
retrieving revision 1.51
diff -r1.51 pmap.c
1685c1685
< 	int flags;               /* Mapping flags. eg. Cache inhibit  */
---
> 	int mapflags;            /* Mapping flags. eg. Cache inhibit  */
1704c1704
< 	flags  = (pa & ~MMU_PAGE_MASK);
---
> 	mapflags  = (pa & ~MMU_PAGE_MASK);
1713c1713
< 		flags |= PMAP_NC;
---
> 		mapflags |= PMAP_NC;
2003c2003
< 	if (flags & PMAP_NC)
---
> 	if (mapflags & PMAP_NC)

Todd Whitesel
toddpw @ best.com