From 422d71a152c25dae0952cd651d60bda181dcd1c1 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zheng.z.yan@intel.com>
Date: Wed, 4 Jul 2012 14:00:14 +0800
Subject: [PATCH] --- yaml --- r: 312311 b: refs/heads/master c:
 42089697244ba8e64fa43fb5e6d50d47a8e4cb00 h: refs/heads/master i:   312309:
 baafda9435a8e42c163f84f5a99f0ecd5debeeac   312307:
 174f4ec1e763a565d5b37aa0d1716339f3d012d5   312303:
 4e082267068a276207928471cde1f2fc8b7b8c8b v: v3

---
 [refs]                                              | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1d505870addd..1e5417197d8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b19e4c98c035c9ab218fc64ef26f4f7a30eafb9
+refs/heads/master: 42089697244ba8e64fa43fb5e6d50d47a8e4cb00
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 7d755d2e1c9c..4fecbd00ee75 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -1605,8 +1605,9 @@ static void __init uncore_cpu_setup(void *dummy)
 
 static int __init uncore_cpu_init(void)
 {
-	int ret, cpu;
+	int ret, cpu, max_cores;
 
+	max_cores = boot_cpu_data.x86_max_cores;
 	switch (boot_cpu_data.x86_model) {
 	case 26: /* Nehalem */
 	case 30:
@@ -1615,9 +1616,13 @@ static int __init uncore_cpu_init(void)
 		msr_uncores = nhm_msr_uncores;
 		break;
 	case 42: /* Sandy Bridge */
+		if (snb_uncore_cbox.num_boxes > max_cores)
+			snb_uncore_cbox.num_boxes = max_cores;
 		msr_uncores = snb_msr_uncores;
 		break;
 	case 45: /* Sandy Birdge-EP */
+		if (snbep_uncore_cbox.num_boxes > max_cores)
+			snbep_uncore_cbox.num_boxes = max_cores;
 		msr_uncores = snbep_msr_uncores;
 		break;
 	default: