Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new patches

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

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/events/intel/ds.c
index 13a78a8a2780dcef4a44101db3da1f803ce3879a,c2e2eae7309c3370a17026af6e933780be8a4dd5..46aaaeae0c8db14eb748f19cda4cef2aa8f5d3d1
--- 1/arch/x86/events/intel/ds.c
--- 2/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@@ -2740,9 -2576,17 +2740,17 @@@ void __init intel_ds_init(void
                                          PERF_SAMPLE_REGS_USER |
                                          PERF_SAMPLE_REGS_INTR);
                        }
 -                      pr_cont("PEBS fmt4%c%s, ", pebs_type, pebs_qual);
 +                      pr_cont("PEBS fmt%d%c%s, ", format, pebs_type, pebs_qual);
  
-                       if (!is_hybrid() && x86_pmu.intel_cap.pebs_output_pt_available) {
+                       /*
+                        * The PEBS-via-PT is not supported on hybrid platforms,
+                        * because not all CPUs of a hybrid machine support it.
+                        * The global x86_pmu.intel_cap, which only contains the
+                        * common capabilities, is used to check the availability
+                        * of the feature. The per-PMU pebs_output_pt_available
+                        * in a hybrid machine should be ignored.
+                        */
+                       if (x86_pmu.intel_cap.pebs_output_pt_available) {
                                pr_cont("PEBS-via-PT, ");
                                x86_get_pmu(smp_processor_id())->capabilities |= PERF_PMU_CAP_AUX_OUTPUT;
                        }

diff --cc arch/x86/include/asm/perf_event.h
Simple merge

diff --cc kernel/events/uprobes.c
Simple merge