i386/ALL kernel and cpu_feature

[David Young <dyoung%pobox.com@localhost>]

I had some trouble building the ALL kernel until I patched the kernel
sources (see attachment).  Does my patch look correct?

Dave

-- 
David Young             OJC Technologies
dyoung%ojctech.com@localhost      Urbana, IL * (217) 278-3933

Index: sys/arch/x86/x86/via_padlock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/via_padlock.c,v
retrieving revision 1.12
diff -p -u -u -p -r1.12 via_padlock.c
--- sys/arch/x86/x86/via_padlock.c      18 Apr 2010 23:47:51 -0000      1.12
+++ sys/arch/x86/x86/via_padlock.c      22 Apr 2010 19:59:58 -0000
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: via_padlock.
 #include <x86/specialreg.h>
 
 #include <machine/cpufunc.h>
+#include <machine/cpuvar.h>
 
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/cryptosoft.h>
Index: sys/arch/i386/i386/pmc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/pmc.c,v
retrieving revision 1.17
diff -p -u -u -p -r1.17 pmc.c
--- sys/arch/i386/i386/pmc.c    11 May 2008 14:44:54 -0000      1.17
+++ sys/arch/i386/i386/pmc.c    22 Apr 2010 19:59:58 -0000
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.17
 #include <sys/proc.h>
 
 #include <machine/cpufunc.h>
+#include <machine/cpuvar.h>
 #include <machine/specialreg.h>
 #include <machine/sysarch.h>
 #include <machine/pmc.h>
@@ -122,7 +123,7 @@ pmc_init(void)
                break;
        }
 
-       if (pmc_type != PMC_TYPE_NONE && (cpu_feature & CPUID_TSC) != 0)
+       if (pmc_type != PMC_TYPE_NONE && (cpu_feature[0] & CPUID_TSC) != 0)
                pmc_flags |= PMC_INFO_HASTSC;
 
 #ifdef MULTIPROCESSOR