diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-13 14:40:14 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-13 14:40:14 -0400 |
| commit | 6363a0acdd757a51c9a6f6b70d634b85b737202b (patch) | |
| tree | 4582578802e0d1d08c909acdb219fe3bd5ac69db | |
| parent | 2030a58db48c93c9697a2a6eb03e71d96d9042de (diff) | |
| download | longterm-queue-4.18-6363a0acdd757a51c9a6f6b70d634b85b737202b.tar.gz | |
perf: drop already applied commit
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/perf-x86-intel-Allow-PEBS-multi-entry-in-watermark-m.patch | 43 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/perf-x86-intel-Allow-PEBS-multi-entry-in-watermark-m.patch b/queue/perf-x86-intel-Allow-PEBS-multi-entry-in-watermark-m.patch deleted file mode 100644 index 4e11e56..0000000 --- a/queue/perf-x86-intel-Allow-PEBS-multi-entry-in-watermark-m.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c7a286577d7592720c2f179aadfb325a1ff48c95 Mon Sep 17 00:00:00 2001 -From: Stephane Eranian <eranian@google.com> -Date: Mon, 13 May 2019 17:34:00 -0700 -Subject: [PATCH] perf/x86/intel: Allow PEBS multi-entry in watermark mode - -commit c7a286577d7592720c2f179aadfb325a1ff48c95 upstream. - -This patch fixes a restriction/bug introduced by: - - 583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS") - -The original patch prevented using multi-entry PEBS when wakeup_events != 0. -However given that wakeup_events is part of a union with wakeup_watermark, it -means that in watermark mode, PEBS multi-entry is also disabled which is not the -intent. This patch fixes this by checking is watermark mode is enabled. - -Signed-off-by: Stephane Eranian <eranian@google.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: jolsa@redhat.com -Cc: kan.liang@intel.com -Cc: vincent.weaver@maine.edu -Fixes: 583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS") -Link: http://lkml.kernel.org/r/20190514003400.224340-1-eranian@google.com -Signed-off-by: Ingo Molnar <mingo@kernel.org> - -diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c -index ef763f535e3a..12ec402f4114 100644 ---- a/arch/x86/events/intel/core.c -+++ b/arch/x86/events/intel/core.c -@@ -3265,7 +3265,7 @@ static int intel_pmu_hw_config(struct perf_event *event) - return ret; - - if (event->attr.precise_ip) { -- if (!(event->attr.freq || event->attr.wakeup_events)) { -+ if (!(event->attr.freq || (event->attr.wakeup_events && !event->attr.watermark))) { - event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD; - if (!(event->attr.sample_type & - ~intel_pmu_large_pebs_flags(event))) --- -2.7.4 - diff --git a/queue/series b/queue/series index 23e16bc..6ef93fc 100644 --- a/queue/series +++ b/queue/series @@ -21,7 +21,6 @@ mfd-tps65912-spi-Add-missing-of-table-registration.patch mfd-intel-lpss-Set-the-device-in-reset-state-when-in.patch drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch mfd-twl6040-Fix-device-init-errors-for-ACCCTL-regist.patch -perf-x86-intel-Allow-PEBS-multi-entry-in-watermark-m.patch drm-nouveau-kms-gf119-gp10x-push-HeadSetControlOutpu.patch drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch objtool-Don-t-use-ignore-flag-for-fake-jumps.patch |