Index: arch/sparc/conf/files.sparc
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/conf/files.sparc,v
retrieving revision 1.102
diff -c -r1.102 files.sparc
*** arch/sparc/conf/files.sparc	2001/06/08 04:49:45	1.102
--- arch/sparc/conf/files.sparc	2001/11/06 10:22:54
***************
*** 3,8 ****
--- 3,14 ----
  # @(#)files.sparc	8.1 (Berkeley) 7/19/93
  # sparc-specific configuration info
  
+ defopt	opt_sparc_arch.h	SUN4
+ defopt	opt_sparc_arch.h	SUN4_MMU3L
+ defopt	opt_sparc_arch.h	SUN4C
+ defopt	opt_sparc_arch.h	SUN4M
+ defopt	opt_sparc_arch.h	SUN4U
+ 
  # maxpartitions must be first item in files.${ARCH}
  maxpartitions 8
  
Index: arch/sparc/fpu/fpu_emu.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/fpu/fpu_emu.h,v
retrieving revision 1.4
diff -c -r1.4 fpu_emu.h
*** arch/sparc/fpu/fpu_emu.h	2000/08/03 18:32:07	1.4
--- arch/sparc/fpu/fpu_emu.h	2001/11/06 10:22:55
***************
*** 44,49 ****
--- 44,53 ----
   *	@(#)fpu_emu.h	8.1 (Berkeley) 6/11/93
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Floating point emulator (tailored for SPARC, but structurally
   * machine-independent).
Index: arch/sparc/fpu/fpu_explode.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/fpu/fpu_explode.c,v
retrieving revision 1.5
diff -c -r1.5 fpu_explode.c
*** arch/sparc/fpu/fpu_explode.c	2000/08/03 18:32:08	1.5
--- arch/sparc/fpu/fpu_explode.c	2001/11/06 10:22:57
***************
*** 49,54 ****
--- 49,58 ----
   * into our internal format.
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  #include <sys/types.h>
  #include <sys/systm.h>
  
Index: arch/sparc/fpu/fpu_extern.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/fpu/fpu_extern.h,v
retrieving revision 1.4
diff -c -r1.4 fpu_extern.h
*** arch/sparc/fpu/fpu_extern.h	2000/08/03 18:32:08	1.4
--- arch/sparc/fpu/fpu_extern.h	2001/11/06 10:22:57
***************
*** 36,41 ****
--- 36,45 ----
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  struct proc;
  #ifndef SUN4U
  struct fpstate;
Index: arch/sparc/fpu/fpu_implode.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/fpu/fpu_implode.c,v
retrieving revision 1.8
diff -c -r1.8 fpu_implode.c
*** arch/sparc/fpu/fpu_implode.c	2001/08/26 05:44:46	1.8
--- arch/sparc/fpu/fpu_implode.c	2001/11/06 10:23:00
***************
*** 49,54 ****
--- 49,58 ----
   * `packed binary' format.
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  #include <sys/types.h>
  #include <sys/systm.h>
  
Index: arch/sparc/include/cpu.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/cpu.h,v
retrieving revision 1.45
diff -c -r1.45 cpu.h
*** arch/sparc/include/cpu.h	2001/09/27 02:05:42	1.45
--- arch/sparc/include/cpu.h	2001/11/06 10:23:00
***************
*** 63,71 ****
   * Exported definitions unique to SPARC cpu support.
   */
  
! #if !defined(_LKM)
  #include "opt_multiprocessor.h"
  #include "opt_lockdebug.h"
  #endif
  
  #include <machine/psl.h>
--- 63,72 ----
   * Exported definitions unique to SPARC cpu support.
   */
  
! #if !defined(_LKM) && defined(_KERNEL_OPT)
  #include "opt_multiprocessor.h"
  #include "opt_lockdebug.h"
+ #include "opt_sparc_arch.h"
  #endif
  
  #include <machine/psl.h>
Index: arch/sparc/include/frame.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/frame.h,v
retrieving revision 1.3
diff -c -r1.3 frame.h
*** arch/sparc/include/frame.h	2001/03/22 06:23:24	1.3
--- arch/sparc/include/frame.h	2001/11/06 10:23:01
***************
*** 44,49 ****
--- 44,53 ----
   *	@(#)frame.h	8.1 (Berkeley) 6/11/93
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Sparc stack frame format.
   *
Index: arch/sparc/include/idprom.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/idprom.h,v
retrieving revision 1.6
diff -c -r1.6 idprom.h
*** arch/sparc/include/idprom.h	1999/11/27 10:10:02	1.6
--- arch/sparc/include/idprom.h	2001/11/06 10:23:01
***************
*** 31,36 ****
--- 31,40 ----
   * SUCH DAMAGE.
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * ID prom format.  The ``host id'' is set up by taking the machine
   * ID as the top byte and the hostid field as the remaining three.
Index: arch/sparc/include/kbd.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/kbd.h,v
retrieving revision 1.7
diff -c -r1.7 kbd.h
*** arch/sparc/include/kbd.h	1997/10/18 00:01:15	1.7
--- arch/sparc/include/kbd.h	2001/11/06 10:23:02
***************
*** 44,49 ****
--- 44,53 ----
   *	@(#)kbd.h	8.1 (Berkeley) 6/11/93
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Keyboard `registers'.  (This should be called kbd_reg.h but we need to
   * be compatible.)
Index: arch/sparc/include/oldmon.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/oldmon.h,v
retrieving revision 1.12
diff -c -r1.12 oldmon.h
*** arch/sparc/include/oldmon.h	1999/02/14 12:26:16	1.12
--- arch/sparc/include/oldmon.h	2001/11/06 10:23:03
***************
*** 37,42 ****
--- 37,46 ----
  #ifndef _MACHINE_OLDMON_H
  #define _MACHINE_OLDMON_H
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   *     Structures, constants and defines for access to the sun monitor.
   *     These are translated from the sun monitor header file "sunromvec.h".
Index: arch/sparc/include/param.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/param.h,v
retrieving revision 1.48
diff -c -r1.48 param.h
*** arch/sparc/include/param.h	2001/05/30 12:28:50	1.48
--- arch/sparc/include/param.h	2001/11/06 10:23:04
***************
*** 54,59 ****
--- 54,62 ----
  #define	MACHINE_ARCH	"sparc"
  #define	MID_MACHINE	MID_SPARC
  
+ #ifdef _KERNEL_OPT
+ #include "opt_sparc_arch.h"
+ #endif
  #ifdef _KERNEL				/* XXX */
  #ifndef _LOCORE				/* XXX */
  #include <machine/cpu.h>		/* XXX */
Index: arch/sparc/include/pmap.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/pmap.h,v
retrieving revision 1.58
diff -c -r1.58 pmap.h
*** arch/sparc/include/pmap.h	2001/09/10 21:19:24	1.58
--- arch/sparc/include/pmap.h	2001/11/06 10:23:09
***************
*** 46,51 ****
--- 46,55 ----
  #ifndef	_SPARC_PMAP_H_
  #define _SPARC_PMAP_H_
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  #include <machine/pte.h>
  
  /*
Index: arch/sparc/include/pte.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/pte.h,v
retrieving revision 1.23
diff -c -r1.23 pte.h
*** arch/sparc/include/pte.h	2001/05/01 20:37:44	1.23
--- arch/sparc/include/pte.h	2001/11/06 10:23:11
***************
*** 48,53 ****
--- 48,57 ----
   *	@(#)pte.h	8.1 (Berkeley) 6/11/93
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Sun-4 (sort of), 4c (SparcStation), and 4m Page Table Entries
   * (Sun calls them `Page Map Entries').
Index: arch/sparc/include/types.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/include/types.h,v
retrieving revision 1.25
diff -c -r1.25 types.h
*** arch/sparc/include/types.h	2001/09/27 02:05:42	1.25
--- arch/sparc/include/types.h	2001/11/06 10:23:12
***************
*** 51,56 ****
--- 51,60 ----
  #undef sun
  #endif
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  #include <sys/cdefs.h>
  #include <machine/int_types.h>
  
Index: arch/sparc/sparc/cache.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/sparc/cache.h,v
retrieving revision 1.22
diff -c -r1.22 cache.h
*** arch/sparc/sparc/cache.h	2000/06/06 07:56:40	1.22
--- arch/sparc/sparc/cache.h	2001/11/06 10:23:13
***************
*** 46,51 ****
--- 46,55 ----
  #ifndef SPARC_CACHE_H
  #define SPARC_CACHE_H
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Sun-4 and Sun-4c virtual address cache.
   *
Index: arch/sparc/sparc/cpuvar.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/sparc/cpuvar.h,v
retrieving revision 1.38
diff -c -r1.38 cpuvar.h
*** arch/sparc/sparc/cpuvar.h	2001/07/10 15:11:54	1.38
--- arch/sparc/sparc/cpuvar.h	2001/11/06 10:23:16
***************
*** 43,48 ****
--- 43,49 ----
  #include "opt_multiprocessor.h"
  #include "opt_lockdebug.h"
  #include "opt_ddb.h"
+ #include "opt_sparc_arch.h"
  #endif
  
  #include <sys/device.h>
Index: arch/sparc64/conf/files.sparc64
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/conf/files.sparc64,v
retrieving revision 1.53
diff -c -r1.53 files.sparc64
*** arch/sparc64/conf/files.sparc64	2001/10/25 23:07:50	1.53
--- arch/sparc64/conf/files.sparc64	2001/11/06 10:23:18
***************
*** 8,13 ****
--- 8,15 ----
  
  maxusers 2 8 1024
  
+ defopt	opt_sparc_arch.h	SUN4U
+ 
  #
  # XXXXXXXXXXX
  #
Index: arch/sparc64/include/bsd_openprom.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/bsd_openprom.h,v
retrieving revision 1.2
diff -c -r1.2 bsd_openprom.h
*** arch/sparc64/include/bsd_openprom.h	2000/03/13 23:52:34	1.2
--- arch/sparc64/include/bsd_openprom.h	2001/11/06 10:23:21
***************
*** 38,43 ****
--- 38,47 ----
   *	@(#)bsd_openprom.h	8.1 (Berkeley) 6/11/93
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Sun4m support by Aaron Brown, Harvard University.
   * Changes Copyright (c) 1995 The President and Fellows of Harvard College.
Index: arch/sparc64/include/frame.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/frame.h,v
retrieving revision 1.9
diff -c -r1.9 frame.h
*** arch/sparc64/include/frame.h	2001/03/04 09:28:35	1.9
--- arch/sparc64/include/frame.h	2001/11/06 10:23:21
***************
*** 44,49 ****
--- 44,53 ----
   *	@(#)frame.h	8.1 (Berkeley) 6/11/93
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Sparc stack frame format.
   *
Index: arch/sparc64/include/idprom.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/idprom.h,v
retrieving revision 1.2
diff -c -r1.2 idprom.h
*** arch/sparc64/include/idprom.h	1998/09/05 23:57:26	1.2
--- arch/sparc64/include/idprom.h	2001/11/06 10:23:21
***************
*** 31,36 ****
--- 31,40 ----
   * SUCH DAMAGE.
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * ID prom format.  The ``host id'' is set up by taking the machine
   * ID as the top byte and the hostid field as the remaining three.
Index: arch/sparc64/include/kbd.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/kbd.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 kbd.h
*** arch/sparc64/include/kbd.h	1998/06/20 04:58:51	1.1.1.1
--- arch/sparc64/include/kbd.h	2001/11/06 10:23:22
***************
*** 44,49 ****
--- 44,53 ----
   *	@(#)kbd.h	8.1 (Berkeley) 6/11/93
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Keyboard `registers'.  (This should be called kbd_reg.h but we need to
   * be compatible.)
Index: arch/sparc64/include/oldmon.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/oldmon.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 oldmon.h
*** arch/sparc64/include/oldmon.h	1998/06/20 04:58:51	1.1.1.1
--- arch/sparc64/include/oldmon.h	2001/11/06 10:23:25
***************
*** 37,42 ****
--- 37,46 ----
  #ifndef _MACHINE_OLDMON_H
  #define _MACHINE_OLDMON_H
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   *     Structures, constants and defines for access to the sun monitor.
   *     These are translated from the sun monitor header file "sunromvec.h".
Index: arch/sparc64/include/param.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/param.h,v
retrieving revision 1.25
diff -c -r1.25 param.h
*** arch/sparc64/include/param.h	2001/05/30 12:28:51	1.25
--- arch/sparc64/include/param.h	2001/11/06 10:23:25
***************
*** 67,73 ****
   *
   */
  
! 
  
  #define	_MACHINE	sparc64
  #define	MACHINE		"sparc64"
--- 67,75 ----
   *
   */
  
! #if defined(_KERNEL_OPT)
! #include "opt_sparc_arch.h"
! #endif
  
  #define	_MACHINE	sparc64
  #define	MACHINE		"sparc64"
***************
*** 81,86 ****
--- 83,91 ----
  #define	MID_MACHINE	MID_SPARC
  #endif
  
+ #ifdef _KERNEL_OPT
+ #include "opt_sparc_arch.h"
+ #endif
  #ifdef _KERNEL				/* XXX */
  #ifndef _LOCORE				/* XXX */
  #include <machine/cpu.h>		/* XXX */
Index: arch/sparc64/include/pte.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/pte.h,v
retrieving revision 1.8
diff -c -r1.8 pte.h
*** arch/sparc64/include/pte.h	2001/08/30 09:32:23	1.8
--- arch/sparc64/include/pte.h	2001/11/06 10:23:26
***************
*** 23,28 ****
--- 23,32 ----
   *
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Address translation works as follows:
   *
Index: arch/sparc64/include/types.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/include/types.h,v
retrieving revision 1.17
diff -c -r1.17 types.h
*** arch/sparc64/include/types.h	2001/05/12 22:42:07	1.17
--- arch/sparc64/include/types.h	2001/11/06 10:23:28
***************
*** 51,56 ****
--- 51,60 ----
  #undef sun
  #endif
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  #include <sys/cdefs.h>
  #include <machine/int_types.h>
  
Index: arch/sparc64/sparc64/cpuvar.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/sparc64/cpuvar.h,v
retrieving revision 1.2
diff -c -r1.2 cpuvar.h
*** arch/sparc64/sparc64/cpuvar.h	1999/11/06 20:18:13	1.2
--- arch/sparc64/sparc64/cpuvar.h	2001/11/06 10:23:29
***************
*** 39,44 ****
--- 39,48 ----
  #ifndef _sparc64_cpuvar_h
  #define _sparc64_cpuvar_h
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  #include <sys/device.h>
  
  #include <sparc64/sparc64/cache.h>	/* for cacheinfo */
Index: arch/sun68k/include/idprom.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sun68k/include/idprom.h,v
retrieving revision 1.1
diff -c -r1.1 idprom.h
*** arch/sun68k/include/idprom.h	2001/06/14 12:57:11	1.1
--- arch/sun68k/include/idprom.h	2001/11/06 10:23:34
***************
*** 39,44 ****
--- 39,48 ----
  #ifndef	_MACHINE_IDPROM_H
  #define	_MACHINE_IDPROM_H
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * structure/definitions for the 32 byte id prom found in all suns.
   */
Index: arch/x68k/include/kbd.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/x68k/include/kbd.h,v
retrieving revision 1.2
diff -c -r1.2 kbd.h
*** arch/x68k/include/kbd.h	1997/10/13 14:23:04	1.2
--- arch/x68k/include/kbd.h	2001/11/06 10:23:36
***************
*** 45,50 ****
--- 45,54 ----
   *	$NetBSD: kbd.h,v 1.2 1997/10/13 14:23:04 lukem Exp $
   */
  
+ #if defined(_KERNEL_OPT)
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  /*
   * Keyboard `registers'.  (This should be called kbd_reg.h but we need to
   * be compatible.)
Index: dev/sbus/sbusvar.h
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/sbus/sbusvar.h,v
retrieving revision 1.12
diff -c -r1.12 sbusvar.h
*** dev/sbus/sbusvar.h	2001/09/24 23:49:34	1.12
--- dev/sbus/sbusvar.h	2001/11/06 10:23:50
***************
*** 39,44 ****
--- 39,48 ----
  #ifndef _SBUS_VAR_H
  #define _SBUS_VAR_H
  
+ #if defined(_KERNEL_OPT) && (defined(__sparc__) || defined(__sparc64__))
+ #include "opt_sparc_arch.h"
+ #endif
+ 
  struct sbus_softc;
  
  /*