svn commit: r215042 - in stable/8/sys: amd64/amd64 conf i386/i386 x86/x86

[Attilio Rao]

Author: attilio
Date: Tue Nov  9 18:42:35 2010
New Revision: 215042
URL: http://svn.freebsd.org/changeset/base/215042

Log:
  MFC r208921 by jhb:
  Move mca.c under x86.
  
  Sponsored by:	Sandvine Incorporated
  Approved by:	jhb

Added:
  stable/8/sys/x86/x86/
  stable/8/sys/x86/x86/mca.c
     - copied, changed from r215039, stable/8/sys/i386/i386/mca.c
Deleted:
  stable/8/sys/amd64/amd64/mca.c
  stable/8/sys/i386/i386/mca.c
Modified:
  stable/8/sys/conf/files.amd64
  stable/8/sys/conf/files.i386
  stable/8/sys/conf/files.pc98
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/conf/files.amd64
==============================================================================
--- stable/8/sys/conf/files.amd64	Tue Nov  9 18:32:57 2010	(r215041)
+++ stable/8/sys/conf/files.amd64	Tue Nov  9 18:42:35 2010	(r215042)
@@ -119,7 +119,6 @@ amd64/amd64/legacy.c		standard
 amd64/amd64/local_apic.c	standard
 amd64/amd64/locore.S		standard	no-obj
 amd64/amd64/machdep.c		standard
-amd64/amd64/mca.c		standard
 amd64/amd64/mem.c		optional	mem
 amd64/amd64/minidump_machdep.c	standard
 amd64/amd64/mp_machdep.c	optional	smp
@@ -319,3 +318,4 @@ x86/isa/isa.c			standard
 x86/isa/isa_dma.c		standard
 x86/isa/nmi.c			standard
 x86/pci/qpi.c			standard
+x86/x86/mca.c			standard

Modified: stable/8/sys/conf/files.i386
==============================================================================
--- stable/8/sys/conf/files.i386	Tue Nov  9 18:32:57 2010	(r215041)
+++ stable/8/sys/conf/files.i386	Tue Nov  9 18:42:35 2010	(r215042)
@@ -282,7 +282,6 @@ i386/xen/locore.s		optional xen	no-obj
 i386/i386/longrun.c		optional cpu_enable_longrun
 i386/i386/machdep.c		standard
 i386/xen/xen_machdep.c		optional xen
-i386/i386/mca.c			standard
 i386/i386/mem.c			optional mem
 i386/i386/minidump_machdep.c	standard
 i386/i386/mp_clock.c		optional smp
@@ -394,3 +393,4 @@ x86/isa/isa.c			optional isa
 x86/isa/isa_dma.c		optional isa
 x86/isa/nmi.c			standard
 x86/pci/qpi.c			standard
+x86/x86/mca.c			standard

Modified: stable/8/sys/conf/files.pc98
==============================================================================
--- stable/8/sys/conf/files.pc98	Tue Nov  9 18:32:57 2010	(r215041)
+++ stable/8/sys/conf/files.pc98	Tue Nov  9 18:42:35 2010	(r215042)
@@ -153,7 +153,6 @@ 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
@@ -258,3 +257,4 @@ pc98/pc98/pc98_machdep.c	standard
 #
 x86/isa/atpic.c			optional atpic	
 x86/isa/isa.c			optional isa
+x86/x86/mca.c			standard

Copied and modified: stable/8/sys/x86/x86/mca.c (from r215039, stable/8/sys/i386/i386/mca.c)
==============================================================================
--- stable/8/sys/i386/i386/mca.c	Tue Nov  9 16:18:32 2010	(r215039, copy source)
+++ stable/8/sys/x86/x86/mca.c	Tue Nov  9 18:42:35 2010	(r215042)
@@ -32,7 +32,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifdef __amd64__
+#define	DEV_APIC
+#else
 #include "opt_apic.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -884,8 +888,9 @@ mca_intr(void)
 		 * Just print the values of the old Pentium registers
 		 * and panic.
 		 */
-		printf("MC Type: 0x%llx  Address: 0x%llx\n",
-		    rdmsr(MSR_P5_MC_TYPE), rdmsr(MSR_P5_MC_ADDR));
+		printf("MC Type: 0x%jx  Address: 0x%jx\n",
+		    (uintmax_t)rdmsr(MSR_P5_MC_TYPE),
+		    (uintmax_t)rdmsr(MSR_P5_MC_ADDR));
 		return (0);
 	}