Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / x86 / events / msr.c

diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
index 50b3a056f96b141cc4f672de735a2accb2af28cd..4bb3ec69e8ea10537c25ef2d792be94f1d7a4127 100644 (file)
--- a/arch/x86/events/msr.c
+++ b/arch/x86/events/msr.c
@@ -36,11 +36,11 @@ static bool test_intel(int idx)
 
        switch (boot_cpu_data.x86_model) {
        case INTEL_FAM6_NEHALEM:
+       case INTEL_FAM6_NEHALEM_G:
        case INTEL_FAM6_NEHALEM_EP:
        case INTEL_FAM6_NEHALEM_EX:
 
        case INTEL_FAM6_WESTMERE:
-       case INTEL_FAM6_WESTMERE2:
        case INTEL_FAM6_WESTMERE_EP:
        case INTEL_FAM6_WESTMERE_EX: