diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 10:44:41 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 10:44:41 (GMT) |
| commit | eff2108f020f30eb90462205ecf3ce10a420938b (patch) | |
| tree | 27d1fc8ab23cd81e4863c29cddc0fbe8cfe68431 /arch/x86/kernel | |
| parent | afb71193a4d8e4a3c4c52a80a8cbee76582f0e90 (diff) | |
| parent | f1a527899ef0a8a241eb3bea619eb2e29d797f44 (diff) | |
| download | linux-fsl-qoriq-eff2108f020f30eb90462205ecf3ce10a420938b.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Merge in the latest fixes, to avoid conflicts with ongoing work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index f60d41f..a9e2207 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -165,13 +165,13 @@ static struct extra_reg intel_snb_extra_regs[] __read_mostly = { 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), + INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd), EVENT_EXTRA_END }; |