From owner-svn-src-stable@FreeBSD.ORG  Fri Oct 30 19:25:14 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DAB21065676;
	Fri, 30 Oct 2009 19:25:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D68DA8FC22;
	Fri, 30 Oct 2009 19:25:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9UJPDsk055527;
	Fri, 30 Oct 2009 19:25:13 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9UJPDhm055523;
	Fri, 30 Oct 2009 19:25:13 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200910301925.n9UJPDhm055523@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 30 Oct 2009 19:25:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198698 - in stable/7/sys: . conf contrib/pf
	pc98/include pc98/pc98
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Oct 2009 19:25:14 -0000

Author: jhb
Date: Fri Oct 30 19:25:13 2009
New Revision: 198698
URL: http://svn.freebsd.org/changeset/base/198698

Log:
  MFC 192106: Port mca(4) to pc98.
  
  Pointy hat to:	jhb

Added:
  stable/7/sys/pc98/include/mca.h
     - copied unchanged from r192106, head/sys/pc98/include/mca.h
Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/conf/files.pc98
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/pc98/pc98/machdep.c

Modified: stable/7/sys/conf/files.pc98
==============================================================================
--- stable/7/sys/conf/files.pc98	Fri Oct 30 18:30:13 2009	(r198697)
+++ stable/7/sys/conf/files.pc98	Fri Oct 30 19:25:13 2009	(r198698)
@@ -157,6 +157,7 @@ i386/i386/k6_mem.c		optional mem
 i386/i386/legacy.c		standard
 i386/i386/local_apic.c		optional apic
 i386/i386/locore.s		standard	no-obj
+i386/i386/mca.c			standard
 i386/i386/mem.c			optional mem
 i386/i386/minidump_machdep.c	standard
 i386/i386/mp_clock.c		optional smp

Copied: stable/7/sys/pc98/include/mca.h (from r192106, head/sys/pc98/include/mca.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/pc98/include/mca.h	Fri Oct 30 19:25:13 2009	(r198698, copy of r192106, head/sys/pc98/include/mca.h)
@@ -0,0 +1,6 @@
+/*-
+ * This file is in the public domain.
+ */
+/* $FreeBSD$ */
+
+#include <i386/mca.h>

Modified: stable/7/sys/pc98/pc98/machdep.c
==============================================================================
--- stable/7/sys/pc98/pc98/machdep.c	Fri Oct 30 18:30:13 2009	(r198697)
+++ stable/7/sys/pc98/pc98/machdep.c	Fri Oct 30 19:25:13 2009	(r198698)
@@ -112,6 +112,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/intr_machdep.h>
+#include <machine/mca.h>
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
 #include <machine/pcb.h>
@@ -257,6 +258,8 @@ cpu_startup(dummy)
 	vm_pager_bufferinit();
 
 	cpu_setregs();
+
+	mca_init();
 }
 
 /*