From owner-svn-src-head@FreeBSD.ORG  Mon Mar 12 21:25:33 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BEDED106567F;
	Mon, 12 Mar 2012 21:25:33 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A6B2D8FC0C;
	Mon, 12 Mar 2012 21:25:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CLPXGY087646;
	Mon, 12 Mar 2012 21:25:33 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CLPXNk087607;
	Mon, 12 Mar 2012 21:25:33 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203122125.q2CLPXNk087607@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 12 Mar 2012 21:25:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232896 - in head/sys: conf mips/adm5120 mips/alchemy
	mips/atheros mips/conf mips/idt mips/include mips/malta
	mips/mips mips/nlm mips/rmi mips/rt305x mips/sentry5
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Mar 2012 21:25:33 -0000

Author: jmallett
Date: Mon Mar 12 21:25:32 2012
New Revision: 232896
URL: http://svn.freebsd.org/changeset/base/232896

Log:
  o) Use ABI, not ISA_* options, to determine whether to compile bits if libkern
     required for the ABI the kernel is being built for.
     XXX This is implemented in a kind-of nasty way that involves including source
         files, but it's still an improvement.
  o) Retire ISA_* options since they're unused and were always wrong.

Added:
  head/sys/mips/mips/libkern_machdep.c   (contents, props changed)
Modified:
  head/sys/conf/files.mips
  head/sys/conf/options.mips
  head/sys/mips/adm5120/std.adm5120
  head/sys/mips/alchemy/std.alchemy
  head/sys/mips/atheros/std.ar71xx
  head/sys/mips/conf/AR71XX_BASE
  head/sys/mips/conf/AR91XX_BASE
  head/sys/mips/conf/MALTA
  head/sys/mips/conf/MALTA64
  head/sys/mips/conf/OCTEON1
  head/sys/mips/conf/SWARM
  head/sys/mips/conf/SWARM_SMP
  head/sys/mips/conf/XLP
  head/sys/mips/conf/XLP64
  head/sys/mips/conf/XLPN32
  head/sys/mips/conf/XLR
  head/sys/mips/conf/XLR64
  head/sys/mips/conf/XLRN32
  head/sys/mips/idt/std.idt
  head/sys/mips/include/_bus.h
  head/sys/mips/malta/std.malta
  head/sys/mips/mips/bus_space_generic.c
  head/sys/mips/mips/cache.c
  head/sys/mips/mips/cache_mipsNN.c
  head/sys/mips/mips/cpu.c
  head/sys/mips/mips/exception.S
  head/sys/mips/mips/freebsd32_machdep.c
  head/sys/mips/mips/machdep.c
  head/sys/mips/mips/pm_machdep.c
  head/sys/mips/mips/support.S
  head/sys/mips/mips/swtch.S
  head/sys/mips/mips/tick.c
  head/sys/mips/mips/vm_machdep.c
  head/sys/mips/nlm/tick.c
  head/sys/mips/rmi/tick.c
  head/sys/mips/rt305x/std.rt305x
  head/sys/mips/sentry5/std.sentry5

Modified: head/sys/conf/files.mips
==============================================================================
--- head/sys/conf/files.mips	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/conf/files.mips	Mon Mar 12 21:25:32 2012	(r232896)
@@ -56,6 +56,7 @@ mips/mips/in_cksum.c		optional	inet | in
 mips/mips/locore.S		standard	no-obj
 mips/mips/minidump_machdep.c	standard
 mips/mips/mem.c			optional	mem
+mips/mips/libkern_machdep.c	standard
 mips/mips/nexus.c		standard
 mips/mips/stack_machdep.c	optional	ddb | stack
 mips/mips/support.S		standard
@@ -72,18 +73,13 @@ geom/geom_mbr_enc.c		optional	geom_mbr
 libkern/ashldi3.c		standard
 libkern/ashrdi3.c		standard
 libkern/cmpdi2.c		standard
-libkern/divdi3.c		optional	isa_mips32
 libkern/ffsl.c			standard
 libkern/fls.c			standard
 libkern/flsl.c			standard
 libkern/lshrdi3.c		standard
 libkern/memchr.c		optional	fdt
 libkern/memmove.c		standard
-libkern/moddi3.c		optional	isa_mips32
-libkern/qdivrem.c		optional	isa_mips32
 libkern/ucmpdi2.c		standard
-libkern/udivdi3.c		optional	isa_mips32
-libkern/umoddi3.c		optional	isa_mips32
 
 #XXX: We can't use these versions, as strcmp.c is included conf/files
 #libkern/mips/strcmp.S		standard

Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/conf/options.mips	Mon Mar 12 21:25:32 2012	(r232896)
@@ -38,14 +38,6 @@ CPU_CNMIPS	opt_global.h
 CPU_RMI		opt_global.h
 CPU_NLM		opt_global.h
 
-# XXX These are bogus and should be replaced by proper ABI or ISA checks.
-ISA_MIPS1	opt_cputype.h
-ISA_MIPS3	opt_cputype.h
-ISA_MIPS32	opt_cputype.h
-ISA_MIPS32v2	opt_cputype.h
-ISA_MIPS64	opt_cputype.h
-ISA_MIPS64v2	opt_cputype.h
-
 COMPAT_FREEBSD32	opt_compat.h
 
 YAMON		opt_global.h

Modified: head/sys/mips/adm5120/std.adm5120
==============================================================================
--- head/sys/mips/adm5120/std.adm5120	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/adm5120/std.adm5120	Mon Mar 12 21:25:32 2012	(r232896)
@@ -6,7 +6,6 @@ files		"../adm5120/files.adm5120"
 
 machine		mips mipsel
 cpu		CPU_MIPS4KC
-options		ISA_MIPS32
 
 # device 	admpci
 device		admsw

Modified: head/sys/mips/alchemy/std.alchemy
==============================================================================
--- head/sys/mips/alchemy/std.alchemy	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/alchemy/std.alchemy	Mon Mar 12 21:25:32 2012	(r232896)
@@ -6,4 +6,3 @@ files	"../alchemy/files.alchemy"
 
 machine		mips mipsel
 cpu		CPU_MIPS4KC
-options		ISA_MIPS32

Modified: head/sys/mips/atheros/std.ar71xx
==============================================================================
--- head/sys/mips/atheros/std.ar71xx	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/atheros/std.ar71xx	Mon Mar 12 21:25:32 2012	(r232896)
@@ -6,4 +6,3 @@ files		"../atheros/files.ar71xx"
 
 machine		mips mipseb
 cpu		CPU_MIPS4KC
-options 	ISA_MIPS32

Modified: head/sys/mips/conf/AR71XX_BASE
==============================================================================
--- head/sys/mips/conf/AR71XX_BASE	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/AR71XX_BASE	Mon Mar 12 21:25:32 2012	(r232896)
@@ -10,7 +10,6 @@
 machine		mips mipseb
 ident		AR71XX_BASE
 cpu		CPU_MIPS4KC
-options 	ISA_MIPS32
 makeoptions	TARGET_BIG_ENDIAN
 makeoptions	KERNLOADADDR=0x80050000
 options		HZ=1000

Modified: head/sys/mips/conf/AR91XX_BASE
==============================================================================
--- head/sys/mips/conf/AR91XX_BASE	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/AR91XX_BASE	Mon Mar 12 21:25:32 2012	(r232896)
@@ -13,7 +13,6 @@
 machine         mips mipseb
 ident		AR91XX_BASE
 cpu		CPU_MIPS4KC
-options 	ISA_MIPS32
 makeoptions	KERNLOADADDR=0x80050000
 options		HZ=1000
 

Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/MALTA	Mon Mar 12 21:25:32 2012	(r232896)
@@ -33,8 +33,6 @@ options 	TICK_USE_YAMON_FREQ=defined
 
 include		"../malta/std.malta"
 
-options		ISA_MIPS32
-
 hints		"MALTA.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols

Modified: head/sys/mips/conf/MALTA64
==============================================================================
--- head/sys/mips/conf/MALTA64	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/MALTA64	Mon Mar 12 21:25:32 2012	(r232896)
@@ -33,8 +33,6 @@ options 	TICK_USE_YAMON_FREQ=defined
 
 include		"../malta/std.malta"
 
-options		ISA_MIPS64
-
 hints		"MALTA.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/OCTEON1	Mon Mar 12 21:25:32 2012	(r232896)
@@ -37,9 +37,6 @@ makeoptions	DEBUG=-g		#Build kernel with
 #options 	OCTEON_VENDOR_LANNER		# Support for Lanner boards.
 #options 	OCTEON_BOARD_CAPK_0100ND	# Support for CAPK-0100nd.
 
-# XXX This option is very nearly irrelevant.
-options 	ISA_MIPS64
-
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking

Modified: head/sys/mips/conf/SWARM
==============================================================================
--- head/sys/mips/conf/SWARM	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/SWARM	Mon Mar 12 21:25:32 2012	(r232896)
@@ -7,7 +7,6 @@ include		"std.SWARM"
 ident		SWARM
 
 machine		mips mipseb
-options		ISA_MIPS32
 
 makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
 makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe

Modified: head/sys/mips/conf/SWARM_SMP
==============================================================================
--- head/sys/mips/conf/SWARM_SMP	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/SWARM_SMP	Mon Mar 12 21:25:32 2012	(r232896)
@@ -10,7 +10,6 @@ options		SMP
 options		PRINTF_BUFR_SIZE=128
 
 machine		mips mipseb
-options		ISA_MIPS32
 
 makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
 makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe

Modified: head/sys/mips/conf/XLP
==============================================================================
--- head/sys/mips/conf/XLP	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/XLP	Mon Mar 12 21:25:32 2012	(r232896)
@@ -20,7 +20,6 @@
 machine 	mips mipseb
 ident           XLP
 
-options		ISA_MIPS32
 makeoptions	KERNLOADADDR=0x80100000
 
 include		"std.XLP"

Modified: head/sys/mips/conf/XLP64
==============================================================================
--- head/sys/mips/conf/XLP64	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/XLP64	Mon Mar 12 21:25:32 2012	(r232896)
@@ -20,7 +20,6 @@
 machine 	mips mips64eb
 ident           XLP64
 
-options 	ISA_MIPS64
 makeoptions	ARCH_FLAGS="-march=mips64r2 -mabi=64"
 makeoptions	KERNLOADADDR=0xffffffff80100000
 

Modified: head/sys/mips/conf/XLPN32
==============================================================================
--- head/sys/mips/conf/XLPN32	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/XLPN32	Mon Mar 12 21:25:32 2012	(r232896)
@@ -20,7 +20,6 @@
 machine 	mips mipsn32eb
 ident           XLPN32
 
-options 	ISA_MIPS64
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=n32"
 makeoptions	KERNLOADADDR=0x80100000
 

Modified: head/sys/mips/conf/XLR
==============================================================================
--- head/sys/mips/conf/XLR	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/XLR	Mon Mar 12 21:25:32 2012	(r232896)
@@ -53,7 +53,6 @@ makeoptions	MODULES_OVERRIDE=""
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	KERNLOADADDR=0x80100000
 #profile		2
-options 	ISA_MIPS32
 
 options 	SCHED_ULE		# ULE scheduler
 #options 	VERBOSE_SYSINIT

Modified: head/sys/mips/conf/XLR64
==============================================================================
--- head/sys/mips/conf/XLR64	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/XLR64	Mon Mar 12 21:25:32 2012	(r232896)
@@ -26,8 +26,6 @@ makeoptions	DEBUG=-g		# Build kernel wit
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
-options		ISA_MIPS64
-
 #profile		2
 
 options 	SCHED_ULE		# ULE scheduler

Modified: head/sys/mips/conf/XLRN32
==============================================================================
--- head/sys/mips/conf/XLRN32	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/conf/XLRN32	Mon Mar 12 21:25:32 2012	(r232896)
@@ -26,7 +26,6 @@ makeoptions	DEBUG=-g		# Build kernel wit
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=n32"
 makeoptions	KERNLOADADDR=0x80100000
 
-options		ISA_MIPS64
 #profile		2
 
 options 	SCHED_ULE		# ULE scheduler

Modified: head/sys/mips/idt/std.idt
==============================================================================
--- head/sys/mips/idt/std.idt	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/idt/std.idt	Mon Mar 12 21:25:32 2012	(r232896)
@@ -4,4 +4,3 @@
 files	"../idt/files.idt"
 
 machine		mips mipsel
-options		ISA_MIPS32

Modified: head/sys/mips/include/_bus.h
==============================================================================
--- head/sys/mips/include/_bus.h	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/include/_bus.h	Mon Mar 12 21:25:32 2012	(r232896)
@@ -31,10 +31,10 @@
 
 #ifndef MIPS_INCLUDE__BUS_H
 #define	MIPS_INCLUDE__BUS_H
+
 /*
  * Bus address and size types
  */
-#include "opt_cputype.h" 
 #if defined(CPU_CNMIPS) && !defined(__mips_n64)
 typedef uint64_t bus_addr_t;
 #else

Modified: head/sys/mips/malta/std.malta
==============================================================================
--- head/sys/mips/malta/std.malta	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/malta/std.malta	Mon Mar 12 21:25:32 2012	(r232896)
@@ -2,7 +2,6 @@
 files	"../malta/files.malta"
 
 cpu		CPU_MIPS4KC
-#options 	ISA_MIPS32
 device		pci
 device		ata
 options 	ATA_CAM

Modified: head/sys/mips/mips/bus_space_generic.c
==============================================================================
--- head/sys/mips/mips/bus_space_generic.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/bus_space_generic.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -197,7 +197,6 @@ static struct bus_space generic_space = 
 };
 
 /* Ultra-gross kludge */
-#include "opt_cputype.h"
 #if defined(CPU_CNMIPS) && (defined(__mips_n32) || defined(__mips_o32))
 #include <contrib/octeon-sdk/cvmx.h>
 #define rd8(a) cvmx_read64_uint8(a)

Modified: head/sys/mips/mips/cache.c
==============================================================================
--- head/sys/mips/mips/cache.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/cache.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -73,8 +73,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/systm.h>
 
-#include "opt_cputype.h"
-
 #include <machine/cpuinfo.h>
 #include <machine/cache.h>
 

Modified: head/sys/mips/mips/cache_mipsNN.c
==============================================================================
--- head/sys/mips/mips/cache_mipsNN.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/cache_mipsNN.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -38,8 +38,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_cputype.h"
-
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>

Modified: head/sys/mips/mips/cpu.c
==============================================================================
--- head/sys/mips/mips/cpu.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/cpu.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_cputype.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>

Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/exception.S	Mon Mar 12 21:25:32 2012	(r232896)
@@ -54,7 +54,6 @@
  *	assembly language support routines.
  */
 
-#include "opt_cputype.h"
 #include "opt_ddb.h"
 #include <machine/asm.h>
 #include <machine/cpu.h>
@@ -62,8 +61,6 @@
 #include <machine/cpuregs.h>
 #include <machine/pte.h>
 
-#include "opt_cputype.h"
-
 #include "assym.s"
 
 	.set	noreorder		# Noreorder is default style!

Modified: head/sys/mips/mips/freebsd32_machdep.c
==============================================================================
--- head/sys/mips/mips/freebsd32_machdep.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/freebsd32_machdep.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -31,7 +31,6 @@
  */
 
 #include "opt_compat.h"
-#include "opt_cputype.h"
 
 #define __ELF_WORD_SIZE 32
 

Added: head/sys/mips/mips/libkern_machdep.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/mips/mips/libkern_machdep.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -0,0 +1,39 @@
+/*-
+ * Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Include libkern support routines for 64-bit operations when building o32
+ * kernels.
+ */
+#if defined(__mips_o32)
+#include <libkern/divdi3.c>
+#include <libkern/moddi3.c>
+#include <libkern/qdivrem.c>
+#include <libkern/udivdi3.c>
+#include <libkern/umoddi3.c>
+#endif

Modified: head/sys/mips/mips/machdep.c
==============================================================================
--- head/sys/mips/mips/machdep.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/machdep.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -42,7 +42,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_md.h"
 

Modified: head/sys/mips/mips/pm_machdep.c
==============================================================================
--- head/sys/mips/mips/pm_machdep.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/pm_machdep.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -39,7 +39,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_cputype.h"
 
 #include <sys/types.h>
 #include <sys/param.h>

Modified: head/sys/mips/mips/support.S
==============================================================================
--- head/sys/mips/mips/support.S	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/support.S	Mon Mar 12 21:25:32 2012	(r232896)
@@ -87,7 +87,6 @@
  *	assembly language support routines.
  */
 
-#include "opt_cputype.h"
 #include "opt_ddb.h"
 #include <sys/errno.h>
 #include <machine/asm.h>

Modified: head/sys/mips/mips/swtch.S
==============================================================================
--- head/sys/mips/mips/swtch.S	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/swtch.S	Mon Mar 12 21:25:32 2012	(r232896)
@@ -56,7 +56,6 @@
  */
 
 #include "opt_compat.h"
-#include "opt_cputype.h"
 #include <sys/syscall.h>
 #include <machine/asm.h>
 #include <machine/cpu.h>

Modified: head/sys/mips/mips/tick.c
==============================================================================
--- head/sys/mips/mips/tick.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/tick.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -33,8 +33,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_cputype.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>

Modified: head/sys/mips/mips/vm_machdep.c
==============================================================================
--- head/sys/mips/mips/vm_machdep.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/mips/vm_machdep.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -42,7 +42,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_cputype.h"
 #include "opt_ddb.h"
 
 #include <sys/param.h>

Modified: head/sys/mips/nlm/tick.c
==============================================================================
--- head/sys/mips/nlm/tick.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/nlm/tick.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_cputype.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>

Modified: head/sys/mips/rmi/tick.c
==============================================================================
--- head/sys/mips/rmi/tick.c	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/rmi/tick.c	Mon Mar 12 21:25:32 2012	(r232896)
@@ -33,8 +33,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_cputype.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>

Modified: head/sys/mips/rt305x/std.rt305x
==============================================================================
--- head/sys/mips/rt305x/std.rt305x	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/rt305x/std.rt305x	Mon Mar 12 21:25:32 2012	(r232896)
@@ -4,5 +4,4 @@
 files	"../rt305x/files.rt305x"
 
 cpu		CPU_MIPS4KC
-options		ISA_MIPS32
 

Modified: head/sys/mips/sentry5/std.sentry5
==============================================================================
--- head/sys/mips/sentry5/std.sentry5	Mon Mar 12 21:24:40 2012	(r232895)
+++ head/sys/mips/sentry5/std.sentry5	Mon Mar 12 21:25:32 2012	(r232896)
@@ -4,7 +4,6 @@
 machine		mips mipsel
 
 cpu		CPU_MIPS4KC
-options 	ISA_MIPS32
 options		CPU_SENTRY5			# XXX should this be a
 						# sub-cpu option?
 files		"../sentry5/files.sentry5"