Module Name: src
Committed By: snj
Date: Thu May 20 18:44:47 UTC 2010
Modified Files:
src/sys/arch/i386/i386 [netbsd-5]: pmc.c
src/sys/arch/x86/x86 [netbsd-5]: via_padlock.c
Log Message:
Apply patch (requested by sborrill in ticket #1404):
Fix build of the i386 ALL kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/i386/i386/pmc.c
cvs rdiff -u -r1.9 -r1.9.14.1 src/sys/arch/x86/x86/via_padlock.c
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/i386/i386/pmc.c
diff -u src/sys/arch/i386/i386/pmc.c:1.17 src/sys/arch/i386/i386/pmc.c:1.17.8.1
--- src/sys/arch/i386/i386/pmc.c:1.17 Sun May 11 14:44:54 2008
+++ src/sys/arch/i386/i386/pmc.c Thu May 20 18:44:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmc.c,v 1.17 2008/05/11 14:44:54 ad Exp $ */
+/* $NetBSD: pmc.c,v 1.17.8.1 2010/05/20 18:44:46 snj Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.17 2008/05/11 14:44:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.17.8.1 2010/05/20 18:44:46 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,6 +50,7 @@
#include <machine/pmc.h>
#include <machine/cpu_counter.h>
#include <machine/cputypes.h>
+#include <machine/cpuvar.h>
static int pmc_initialized;
static int pmc_ncounters;
Index: src/sys/arch/x86/x86/via_padlock.c
diff -u src/sys/arch/x86/x86/via_padlock.c:1.9 src/sys/arch/x86/x86/via_padlock.c:1.9.14.1
--- src/sys/arch/x86/x86/via_padlock.c:1.9 Wed Apr 16 16:06:52 2008
+++ src/sys/arch/x86/x86/via_padlock.c Thu May 20 18:44:47 2010
@@ -1,5 +1,5 @@
/* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */
-/* $NetBSD: via_padlock.c,v 1.9 2008/04/16 16:06:52 cegger Exp $ */
+/* $NetBSD: via_padlock.c,v 1.9.14.1 2010/05/20 18:44:47 snj Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.9 2008/04/16 16:06:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.9.14.1 2010/05/20 18:44:47 snj Exp $");
#include "opt_viapadlock.h"
@@ -36,6 +36,7 @@
#include <x86/specialreg.h>
#include <machine/cpufunc.h>
+#include <machine/cpuvar.h>
#include <opencrypto/cryptodev.h>
#include <opencrypto/cryptosoft.h>
