32c32
< __FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_piv.c 184802 2008-11-09 17:37:54Z jkoshy $");
---
> __FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_piv.c 185341 2008-11-26 19:25:13Z jkim $");
43a44
> #include <machine/cputypes.h>
1613c1614
< KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0,
---
> KASSERT(cpu_vendor_id == CPU_VENDOR_INTEL,
< __FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_piv.c 184802 2008-11-09 17:37:54Z jkoshy $");
---
> __FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_piv.c 185341 2008-11-26 19:25:13Z jkim $");
43a44
> #include <machine/cputypes.h>
1613c1614
< KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0,
---
> KASSERT(cpu_vendor_id == CPU_VENDOR_INTEL,