Module Name: src
Committed By: maxv
Date: Fri Mar 24 17:09:37 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/i386/i386: machdep.c
src/sys/arch/x86/x86: x86_machdep.c
src/sys/arch/xen/conf: files.xen
Log Message:
Don't compile PMCs on Xen.
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.781 -r1.782 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/x86/x86/x86_machdep.c
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/xen/conf/files.xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.254 src/sys/arch/amd64/amd64/machdep.c:1.255
--- src/sys/arch/amd64/amd64/machdep.c:1.254 Thu Mar 23 17:25:51 2017
+++ src/sys/arch/amd64/amd64/machdep.c Fri Mar 24 17:09:36 2017
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#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 @@ init_x86_64(paddr_t first_avail)
}
#endif
- pmc_init();
-
pcb->pcb_dbregs = NULL;
x86_dbregs_setup_initdbstate();
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.781 src/sys/arch/i386/i386/machdep.c:1.782
--- src/sys/arch/i386/i386/machdep.c:1.781 Thu Mar 23 18:08:06 2017
+++ src/sys/arch/i386/i386/machdep.c Fri Mar 24 17:09:36 2017
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#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 @@ init386(paddr_t first_avail)
rw_init(&svr4_fasttrap_lock);
- pmc_init();
-
pcb->pcb_dbregs = NULL;
x86_dbregs_setup_initdbstate();
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.89 src/sys/arch/x86/x86/x86_machdep.c:1.90
--- src/sys/arch/x86/x86/x86_machdep.c:1.89 Tue Feb 14 13:29:09 2017
+++ src/sys/arch/x86/x86/x86_machdep.c Fri Mar 24 17:09:37 2017
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: x86_machdep.
#include <machine/bootinfo.h>
#include <machine/vmparam.h>
+#include <machine/pmc.h>
#include <uvm/uvm_extern.h>
@@ -1072,10 +1073,10 @@ machdep_init(void)
void
x86_startup(void)
{
-
#if !defined(XEN)
nmi_init();
-#endif /* !defined(XEN) */
+ pmc_init();
+#endif
}
/*
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.145 src/sys/arch/xen/conf/files.xen:1.146
--- src/sys/arch/xen/conf/files.xen:1.145 Fri Mar 10 14:40:56 2017
+++ src/sys/arch/xen/conf/files.xen Fri Mar 24 17:09:37 2017
@@ -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/intr.c machdep
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
