Index: sys/boot/common/dev_net.c
===================================================================
RCS file: /rot13/mnt2/ncvs/src/sys/boot/common/dev_net.c,v
retrieving revision 1.11
diff -u -r1.11 dev_net.c
--- sys/boot/common/dev_net.c	31 Jul 2002 20:17:06 -0000	1.11
+++ sys/boot/common/dev_net.c	10 Dec 2002 01:07:06 -0000
@@ -228,6 +228,7 @@
 	printf("net_open: BOOTP failed, trying RARP/RPC...\n");
 #endif
 
+#ifdef SUPPORT_RARP
     /*
      * Use RARP to get our IP address.  This also sets our
      * netmask to the "natural" default for our address.
@@ -237,6 +238,7 @@
 	return (EIO);
     }
     printf("net_open: client addr: %s\n", inet_ntoa(myip));
+#endif
 
     /* Get our hostname, server IP address, gateway. */
     if (bp_whoami(sock)) {
Index: sys/conf/files.sparc64
===================================================================
RCS file: /rot13/mnt2/ncvs/src/sys/conf/files.sparc64,v
retrieving revision 1.34
diff -u -r1.34 files.sparc64
--- sys/conf/files.sparc64	20 Oct 2002 17:03:14 -0000	1.34
+++ sys/conf/files.sparc64	18 Jan 2003 02:40:05 -0000
@@ -74,3 +74,108 @@
 sparc64/sparc64/trap.c		standard
 sparc64/sparc64/tsb.c		standard
 sparc64/sparc64/vm_machdep.c	standard
+
+#	$OpenBSD: files.rasops,v 1.2 2002/05/28 22:10:03 fgsch Exp $
+# 	$NetBSD: files.rasops,v 1.7 2001/01/21 13:50:59 takemura Exp $
+#
+## Note: `rasops_glue' is only here to force the header file's name
+##       hence it must be mentioned first  (shudder...)
+#file dev/rasops/rasops.c ( (rasops_glue |
+#    rasops1 | rasops2 | rasops4 | rasops8 | rasops15 | rasops16 | rasops24 |
+#    rasops32) &
+#    (rasterconsole | wsdisplay)) needs-flag
+#
+#file dev/rasops/rasops_masks.c ((rasterconsole | wsdisplay) &
+#    (rasops1 | rasops2 | rasops4))
+#file dev/rasops/rasops1.c ((rasterconsole | wsdisplay) & rasops1)
+#file dev/rasops/rasops2.c ((rasterconsole | wsdisplay) & rasops2)
+#file dev/rasops/rasops4.c ((rasterconsole | wsdisplay) & rasops4)
+#file dev/rasops/rasops8.c ((rasterconsole | wsdisplay) & rasops8)
+#file dev/rasops/rasops15.c ((rasterconsole | wsdisplay) & (rasops15 | rasops16))
+#file dev/rasops/rasops24.c ((rasterconsole | wsdisplay) & rasops24)
+#file dev/rasops/rasops32.c ((rasterconsole | wsdisplay) & rasops32)
+#
+#dev/rasops/rasops.c	optional wsdisplay rasops_glue
+#dev/rasops/rasops.c	optional wsdisplay rasops1
+#dev/rasops/rasops.c	optional wsdisplay rasops2
+#dev/rasops/rasops.c	optional wsdisplay rasops4
+dev/rasops/rasops.c	optional wsdisplay creator
+#dev/rasops/rasops.c	optional wsdisplay rasops15
+dev/rasops/rasops.c	optional wsdisplay creator
+#dev/rasops/rasops_masks.c optional wsdisplay rasops1
+#dev/rasops/rasops_masks.c optional wsdisplay rasops2
+#dev/rasops/rasops_masks.c optional wsdisplay rasops4
+#dev/rasops/rasops1.c	optional wsdisplay rasops1
+#dev/rasops/rasops2.c	optional wsdisplay rasops2
+#dev/rasops/rasops4.c	optional wsdisplay rasops4
+dev/rasops/rasops8.c	optional wsdisplay creator
+#dev/rasops/rasops15.c	optional wsdisplay rasops15
+dev/rasops/rasops15.c	optional wsdisplay creator
+dev/rasops/rasops24.c	optional wsdisplay creator
+dev/rasops/rasops32.c	optional wsdisplay creator
+#
+#files.sparc64:file      arch/sparc64/dev/creator.c              creator
+#files.sparc64:attach creator at mainbus with creator_mainbus
+#files.sparc64:file      arch/sparc64/dev/creator_mainbus.c      creator_mainbus
+#files.sparc64:attach creator at upa with creator_upa
+#files.sparc64:file      arch/sparc64/dev/creator_upa.c          creator_upa
+sparc64/creator/creator.c              optional creator
+sparc64/creator/creator_mainbus.c      optional creator_mainbus
+sparc64/creator/creator_upa.c          optional creator_upa
+
+# this loses, but there's no way to define attributes which have attributes
+#device  wsdisplay #tty?
+#attach  wsdisplay at wsemuldisplaydev with wsdisplay_emul
+#attach  wsdisplay at wsdisplaydev with wsdisplay_noemul
+#device  wskbd
+#attach  wskbd at wskbddev
+#device  wsmouse
+#attach  wsmouse at wsmousedev
+#
+#file    dev/wscons/wsdisplay.c                  wsdisplay needs-flag
+#file    dev/wscons/wsdisplay_compat_usl.c       wsdisplay & wsdisplay_compat_usl
+#file    dev/wscons/wsemulconf.c                 wsdisplay
+#file    dev/wscons/wsemul_dumb.c                wsdisplay & wsemul_dumb
+#file    dev/wscons/wsemul_vt100.c               wsdisplay & !wsemul_no_vt100
+#file    dev/wscons/wsemul_vt100_subr.c          wsdisplay & !wsemul_no_vt100
+#file    dev/wscons/wsemul_vt100_chars.c         wsdisplay & !wsemul_no_vt100
+#file    dev/wscons/wsemul_vt100_keys.c          wsdisplay & !wsemul_no_vt100
+#file    dev/wscons/wsevent.c    wskbd | wsmouse
+#file    dev/wscons/wskbd.c      wskbd needs-flag
+#file    dev/wscons/wskbdutil.c  wskbd needs-flag
+#file    dev/wscons/wsmouse.c    wsmouse needs-flag
+#
+#file    dev/rcons/raster_op.c                   wsrasteremulops
+#file    dev/rcons/raster_text.c                 wsrasteremulops
+#file    dev/wscons/wscons_rinit.c               wsrasteremulops
+#file    dev/wscons/wscons_rops.c                wsrasteremulops
+#file    dev/wscons/wscons_gallant19.c           wsrasteremulops
+#file    dev/wscons/wscons_font8x16.c    wsrasteremulops
+#
+#pseudo-device   wsmux
+#file    dev/wscons/wsmux.c                      wsmux | wsdisplay needs-flag
+#
+#define  wsemul_sun
+#file    dev/wscons/wsemul_sun.c                 wsdisplay & wsemul_sun needs-flag
+
+dev/wscons/wsdisplay.c          optional wsdisplay
+#dev/wscons/wsdisplay_compat_usl.c optional wsdisplay wsdisplay_compat_usl
+dev/wscons/wsemulconf.c         optional wsdisplay
+#dev/wscons/wsemul_dumb.c	optional wsdisplay wsemul_dumb
+#dev/wscons/wsemul_vt100.c               wsdisplay & !wsemul_no_vt100
+#dev/wscons/wsemul_vt100_subr.c          wsdisplay & !wsemul_no_vt100
+#dev/wscons/wsemul_vt100_chars.c         wsdisplay & !wsemul_no_vt100
+#dev/wscons/wsemul_vt100_keys.c          wsdisplay & !wsemul_no_vt100
+#dev/wscons/wsevent.c    wskbd | wsmouse
+#dev/wscons/wskbd.c      wskbd needs-flag
+#dev/wscons/wskbdutil.c  wskbd needs-flag
+#dev/wscons/wsmouse.c    wsmouse needs-flag
+
+#dev/rcons/raster_op.c		optional wsrasteremulops
+#dev/rcons/raster_text.c		optional wsrasteremulops
+#dev/wscons/wscons_rinit.c	optional wsrasteremulops
+#dev/wscons/wscons_rops.c	optional wsrasteremulops
+#dev/wscons/wscons_gallant19.c	optional wsrasteremulops
+#dev/wscons/wscons_font8x16.c	optional wsrasteremulops
+
+dev/wscons/wsemul_sun.c		optional wsdisplay #wsemul_sun
\ No newline at end of file
Index: sys/conf/majors
===================================================================
RCS file: /rot13/mnt2/ncvs/src/sys/conf/majors,v
retrieving revision 1.152
diff -u -r1.152 majors
--- sys/conf/majors	31 Dec 2002 06:54:52 -0000	1.152
+++ sys/conf/majors	18 Jan 2003 01:44:39 -0000
@@ -201,6 +201,7 @@
 180	nvidia		NVIDIA (nvidiaN/nvidiactl)
 181	casm		HP/Compaq ProLiant Advanced Server Management <peter>
 182	zs		Zilog 8350 serial chip <jake>
+183	creator		Sparc64 Creator
 200	??		entries from 200-252 are reserved for local use
 252	??		entries from 200-252 are reserved for local use
 253	was:MFS		was: used by MFS in <= RELENG_4
Index: sys/sparc64/sparc64/db_disasm.c
===================================================================
RCS file: /rot13/mnt2/ncvs/src/sys/sparc64/sparc64/db_disasm.c,v
retrieving revision 1.6
diff -u -r1.6 db_disasm.c
--- sys/sparc64/sparc64/db_disasm.c	15 Jan 2003 02:15:57 -0000	1.6
+++ sys/sparc64/sparc64/db_disasm.c	16 Jan 2003 08:55:31 -0000
@@ -32,6 +32,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_access.h>
