[src/trunk]: src/sys/arch Don't compile PMCs on Xen.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ea97a7ab373
branches:  trunk
changeset: 352296:5ea97a7ab373
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Mar 24 17:09:36 2017 +0000

description:
Don't compile PMCs on Xen.

diffstat:

 sys/arch/amd64/amd64/machdep.c |  7 ++-----
 sys/arch/i386/i386/machdep.c   |  7 ++-----
 sys/arch/x86/x86/x86_machdep.c |  9 +++++----
 sys/arch/xen/conf/files.xen    |  3 +--
 4 files changed, 10 insertions(+), 16 deletions(-)

diffs (126 lines):

diff -r 12c0a69cbca7 -r 5ea97a7ab373 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Fri Mar 24 14:32:29 2017 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Fri Mar 24 17:09:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.254 2017/03/23 17:25:51 maxv Exp $       */
+/*     $NetBSD: machdep.c,v 1.255 2017/03/24 17:09:36 maxv Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.254 2017/03/23 17:25:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.255 2017/03/24 17:09:36 maxv Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -170,7 +170,6 @@
 #include <machine/gdt.h>
 #include <machine/intr.h>
 #include <machine/pio.h>
-#include <machine/pmc.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
 #include <machine/specialreg.h>
@@ -1767,8 +1766,6 @@
        }
 #endif
 
-       pmc_init();
-
        pcb->pcb_dbregs = NULL;
 
        x86_dbregs_setup_initdbstate();
diff -r 12c0a69cbca7 -r 5ea97a7ab373 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Fri Mar 24 14:32:29 2017 +0000
+++ b/sys/arch/i386/i386/machdep.c      Fri Mar 24 17:09:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.781 2017/03/23 18:08:06 maxv Exp $       */
+/*     $NetBSD: machdep.c,v 1.782 2017/03/24 17:09:36 maxv Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.781 2017/03/23 18:08:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.782 2017/03/24 17:09:36 maxv Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -135,7 +135,6 @@
 #include <machine/intr.h>
 #include <machine/kcore.h>
 #include <machine/pio.h>
-#include <machine/pmc.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
 #include <machine/specialreg.h>
@@ -1410,8 +1409,6 @@
 
        rw_init(&svr4_fasttrap_lock);
 
-       pmc_init();
-
        pcb->pcb_dbregs = NULL;
 
        x86_dbregs_setup_initdbstate();
diff -r 12c0a69cbca7 -r 5ea97a7ab373 sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Fri Mar 24 14:32:29 2017 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Fri Mar 24 17:09:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.89 2017/02/14 13:29:09 nonaka Exp $  */
+/*     $NetBSD: x86_machdep.c,v 1.90 2017/03/24 17:09:37 maxv Exp $    */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.89 2017/02/14 13:29:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.90 2017/03/24 17:09:37 maxv Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -66,6 +66,7 @@
 
 #include <machine/bootinfo.h>
 #include <machine/vmparam.h>
+#include <machine/pmc.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -1072,10 +1073,10 @@
 void
 x86_startup(void)
 {
-
 #if !defined(XEN)
        nmi_init();
-#endif /* !defined(XEN) */
+       pmc_init();
+#endif
 }
 
 /* 
diff -r 12c0a69cbca7 -r 5ea97a7ab373 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Fri Mar 24 14:32:29 2017 +0000
+++ b/sys/arch/xen/conf/files.xen       Fri Mar 24 17:09:36 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen,v 1.145 2017/03/10 14:40:56 maxv Exp $
+#      $NetBSD: files.xen,v 1.146 2017/03/24 17:09:37 maxv Exp $
 #      NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #      NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -140,7 +140,6 @@
 file   arch/xen/x86/xen_ipi.c          multiprocessor
 file   arch/x86/x86/pmap.c             machdep
 file   arch/x86/x86/pmap_tlb.c         machdep
-file   arch/x86/x86/pmc.c              machdep
 file   arch/x86/x86/procfs_machdep.c   procfs
 file   arch/x86/x86/sys_machdep.c      machdep
 file   arch/x86/x86/tsc.c              machdep