From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 21 Apr 2013 08:57:33 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v3.10-rc1~174^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73e21ce28d8d2b75140b742b01373c3a085ecc52;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel.c

Merge in the latest fixes before applying new patches, resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

73e21ce28d8d2b75140b742b01373c3a085ecc52
diff --cc arch/x86/kernel/cpu/perf_event_intel.c
index 2ad2374,cc45deb..ffd6050
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@@ -157,9 -153,14 +157,16 @@@ static struct event_constraint intel_ge
  };
  
  static struct extra_reg intel_snb_extra_regs[] __read_mostly = {
- 	INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3fffffffffull, RSP_0),
- 	INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3fffffffffull, RSP_1),
+ 	INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3f807f8fffull, RSP_0),
+ 	INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3f807f8fffull, RSP_1),
 +	INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
++	INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
+ 	EVENT_EXTRA_END
+ };
+ 
+ static struct extra_reg intel_snbep_extra_regs[] __read_mostly = {
+ 	INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, RSP_0),
+ 	INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, RSP_1),
  	EVENT_EXTRA_END
  };