---

yaml --- r: 310603 b: refs/heads/master c: b6db437 h: refs/heads/master i: 310601: 84f44aa 310599: a862e0d v: v3
git-mirror · Jun 6, 2012 · d690fc3 · d690fc3
1 parent a26f2b9
commit d690fc3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cccb9ba9e4ee0d750265f53de9258df69655c40b
+refs/heads/master: b6db437ba8322f5cee0bd355ad2ef9f73c413754
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel.c b/trunk/arch/x86/kernel/cpu/perf_event_intel.c
@@ -1909,8 +1909,9 @@ __init int intel_pmu_init(void)
 		break;
 
 	case 42: /* SandyBridge */
-		x86_add_quirk(intel_sandybridge_quirk);
 	case 45: /* SandyBridge, "Romely-EP" */
+		x86_add_quirk(intel_sandybridge_quirk);
+	case 58: /* IvyBridge */
 		memcpy(hw_cache_event_ids, snb_hw_cache_event_ids,
 		       sizeof(hw_cache_event_ids));