svn commit: r198698 - in stable/7/sys: . conf contrib/pf pc98/include pc98/pc98

[John Baldwin]

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();
 }
 
 /*