Module Name: src
Committed By: maxv
Date: Wed Jul 12 16:59:41 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: files.amd64
src/sys/arch/i386/conf: files.i386
src/sys/arch/x86/x86: pmc.c sys_machdep.c
src/sys/arch/xen/conf: files.compat
Log Message:
include opt_pmc.h
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.378 -r1.379 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/pmc.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x86/x86/sys_machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/xen/conf/files.compat
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/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.88 src/sys/arch/amd64/conf/files.amd64:1.89
--- src/sys/arch/amd64/conf/files.amd64:1.88 Thu Dec 15 12:04:17 2016
+++ src/sys/arch/amd64/conf/files.amd64 Wed Jul 12 16:59:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.amd64,v 1.88 2016/12/15 12:04:17 kamil Exp $
+# $NetBSD: files.amd64,v 1.89 2017/07/12 16:59:41 maxv Exp $
#
# new style config file for amd64 architecture
#
@@ -24,6 +24,7 @@ defparam opt_physmem.h PHYSMEM_MAX_ADDR
# with the i386 (they include the opt_*.h for these)
#
+defflag PMC
defflag USER_LDT
defflag eisa.h EISA
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.378 src/sys/arch/i386/conf/files.i386:1.379
--- src/sys/arch/i386/conf/files.i386:1.378 Fri Mar 10 14:40:56 2017
+++ src/sys/arch/i386/conf/files.i386 Wed Jul 12 16:59:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.378 2017/03/10 14:40:56 maxv Exp $
+# $NetBSD: files.i386,v 1.379 2017/07/12 16:59:41 maxv Exp $
#
# new style config file for i386 architecture
#
@@ -21,6 +21,8 @@ obsolete defflag XBOX
# VM86 emulation
defflag VM86
+defflag PMC
+
# User-settable LDT (used by WINE)
defflag USER_LDT
Index: src/sys/arch/x86/x86/pmc.c
diff -u src/sys/arch/x86/x86/pmc.c:1.8 src/sys/arch/x86/x86/pmc.c:1.9
--- src/sys/arch/x86/x86/pmc.c:1.8 Wed Jun 14 17:48:40 2017
+++ src/sys/arch/x86/x86/pmc.c Wed Jul 12 16:59:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmc.c,v 1.8 2017/06/14 17:48:40 maxv Exp $ */
+/* $NetBSD: pmc.c,v 1.9 2017/07/12 16:59:41 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -67,7 +67,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.8 2017/06/14 17:48:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.9 2017/07/12 16:59:41 maxv Exp $");
+
+#include "opt_pmc.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/x86/x86/sys_machdep.c
diff -u src/sys/arch/x86/x86/sys_machdep.c:1.35 src/sys/arch/x86/x86/sys_machdep.c:1.36
--- src/sys/arch/x86/x86/sys_machdep.c:1.35 Fri Mar 10 14:54:12 2017
+++ src/sys/arch/x86/x86/sys_machdep.c Wed Jul 12 16:59:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.35 2017/03/10 14:54:12 maxv Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.36 2017/07/12 16:59:41 maxv Exp $ */
/*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -30,9 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.35 2017/03/10 14:54:12 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.36 2017/07/12 16:59:41 maxv Exp $");
#include "opt_mtrr.h"
+#include "opt_pmc.h"
#include "opt_user_ldt.h"
#include "opt_compat_netbsd.h"
#ifdef i386
Index: src/sys/arch/xen/conf/files.compat
diff -u src/sys/arch/xen/conf/files.compat:1.25 src/sys/arch/xen/conf/files.compat:1.26
--- src/sys/arch/xen/conf/files.compat:1.25 Tue Dec 13 10:54:27 2016
+++ src/sys/arch/xen/conf/files.compat Wed Jul 12 16:59:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.compat,v 1.25 2016/12/13 10:54:27 kamil Exp $
+# $NetBSD: files.compat,v 1.26 2017/07/12 16:59:41 maxv Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# options for MP configuration through the MP spec
@@ -28,6 +28,8 @@ defflag opt_pcifixup.h XXXOPT_PCIFIXUP
# VM86 emulation
defflag opt_vm86.h XXXVM86
+defflag opt_pmc.h XXXPMC
+
# User-settable LDT (used by WINE)
defflag opt_user_ldt.h XXXUSER_LDT
