tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
"Two small fixlets"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Add Haswell ULT model number used in Macbook Air and other systems
perf/x86: Fix intel QPI uncore event definitions

Linus Torvalds bfd36050 b88a2595

+3 -2
+1
arch/x86/kernel/cpu/perf_event_intel.c
··· 2270 2270 case 70: 2271 2271 case 71: 2272 2272 case 63: 2273 + case 69: 2273 2274 x86_pmu.late_ack = true; 2274 2275 memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, sizeof(hw_cache_event_ids)); 2275 2276 memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));
+2 -2
arch/x86/kernel/cpu/perf_event_intel_uncore.c
··· 314 314 static struct uncore_event_desc snbep_uncore_qpi_events[] = { 315 315 INTEL_UNCORE_EVENT_DESC(clockticks, "event=0x14"), 316 316 INTEL_UNCORE_EVENT_DESC(txl_flits_active, "event=0x00,umask=0x06"), 317 - INTEL_UNCORE_EVENT_DESC(drs_data, "event=0x02,umask=0x08"), 318 - INTEL_UNCORE_EVENT_DESC(ncb_data, "event=0x03,umask=0x04"), 317 + INTEL_UNCORE_EVENT_DESC(drs_data, "event=0x102,umask=0x08"), 318 + INTEL_UNCORE_EVENT_DESC(ncb_data, "event=0x103,umask=0x04"), 319 319 { /* end: all zeroes */ }, 320 320 }; 321 321