28c28
< __FBSDID("$FreeBSD: head/lib/libpmc/libpmc.c 228869 2011-12-24 19:34:52Z jhibbits $");
---
> __FBSDID("$FreeBSD: head/lib/libpmc/libpmc.c 232366 2012-03-01 21:23:26Z davide $");
181a182,186
> static const struct pmc_event_descr sandybridge_event_table[] =
> {
> __PMC_EV_ALIAS_SANDYBRIDGE()
> };
>
191a197,201
> static const struct pmc_event_descr sandybridgeuc_event_table[] =
> {
> __PMC_EV_ALIAS_SANDYBRIDGEUC()
> };
>
210a221
> PMC_MDEP_TABLE(sandybridge, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
244a256
> PMC_CLASS_TABLE_DESC(sandybridge, IAP, sandybridge, iap);
247a260
> PMC_CLASS_TABLE_DESC(sandybridgeuc, UCP, sandybridgeuc, ucp);
532a546,547
> #define sandybridge_aliases core2_aliases
> #define sandybridge_aliases_without_iaf core2_aliases_without_iaf
2564a2580,2583
> case PMC_CPU_INTEL_SANDYBRIDGE:
> ev = sandybridge_event_table;
> count = PMC_EVENT_TABLE_SIZE(sandybridge);
> break;
2585a2605,2608
> case PMC_CPU_INTEL_SANDYBRIDGE:
> ev = sandybridgeuc_event_table;
> count = PMC_EVENT_TABLE_SIZE(sandybridgeuc);
> break;
2816a2840,2844
> case PMC_CPU_INTEL_SANDYBRIDGE:
> pmc_class_table[n++] = &ucf_class_table_descr;
> pmc_class_table[n++] = &sandybridgeuc_class_table_descr;
> PMC_MDEP_INIT_INTEL_V2(sandybridge);
> break;
2939a2968,2971
> case PMC_CPU_INTEL_SANDYBRIDGE:
> ev = sandybridge_event_table;
> evfence = sandybridge_event_table + PMC_EVENT_TABLE_SIZE(sandybridge);
> break;
2955a2988,2991
> case PMC_CPU_INTEL_SANDYBRIDGE:
> ev = sandybridgeuc_event_table;
> evfence = sandybridgeuc_event_table + PMC_EVENT_TABLE_SIZE(sandybridgeuc);
> break;