Stephane Eranian f9706dd945 perf/x86/intel: Allow PEBS multi-entry in watermark mode ...

[ Upstream commit c7a286577d ]

This patch fixes a restriction/bug introduced by:

   583feb08e7 ("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: 583feb08e7 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

2019-06-15 11:54:03 +02:00

..

alpha

alpha: Fix Eiger NR_IRQS to 128

2019-02-20 10:25:47 +01:00

arc

arc: hsdk_defconfig: Enable CONFIG_BLK_DEV_RAM

2019-04-20 09:15:54 +02:00

arm

ARM: prevent tracing IPI_CPU_BACKTRACE

2019-06-15 11:54:00 +02:00

arm64

arm64: Fix the arm64_personality() syscall wrapper redirection

2019-06-09 09:17:20 +02:00

c6x

kbuild: rename LDFLAGS to KBUILD_LDFLAGS

2018-08-24 08:22:08 +09:00

h8300

h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux-

2019-04-05 22:32:55 +02:00

hexagon

hexagon: modify ffs() and fls() to return int

2018-09-10 19:42:15 -05:00

ia64

ia64: Fix allnoconfig section mismatch for ioc_init/ioc_iommu_info

2018-08-22 14:12:47 -07:00

m68k

m68k: Add -ffreestanding to CFLAGS

2019-03-23 20:10:00 +01:00

microblaze

mm: make the __PAGETABLE_PxD_FOLDED defines non-empty

2018-12-29 13:37:57 +01:00

mips

Revert "MIPS: perf: ath79: Fix perfcount IRQ assignment"

2019-06-11 12:20:53 +02:00

nds32

nds32: Fix gcc 8.0 compiler option incompatible.

2019-02-12 19:46:57 +01:00

nios2

nios2: kconfig: remove duplicate DEBUG_STACK_USAGE symbol defintions

2018-08-27 09:47:20 +08:00

openrisc

Merge tag 'for-linus' of git://github.com/openrisc/linux

2018-08-23 14:09:37 -07:00

parisc

parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code

2019-05-25 18:23:24 +02:00

powerpc

pstore: Convert buf_lock to semaphore

2019-06-11 12:20:52 +02:00

riscv

riscv: fix accessing 8-byte variable from RV32

2019-05-08 07:21:47 +02:00

s390

s390/mm: fix address space detection in exception handling

2019-06-11 12:20:53 +02:00

sh

sh: sh7786: Add explicit I/O cast to sh7786_mm_sel()

2019-05-31 06:46:28 -07:00

sparc

sparc64: Fix regression in non-hypervisor TLB flush xcall

2019-06-09 09:17:10 +02:00

um

um: Don't hardcode path as it is architecture dependent

2019-05-16 19:41:28 +02:00

unicore32

mm: convert return type of handle_mm_fault() caller to vm_fault_t

2018-08-17 16:20:28 -07:00

x86

perf/x86/intel: Allow PEBS multi-entry in watermark mode

2019-06-15 11:54:03 +02:00

xtensa

xtensa: fix return_address

2019-04-17 08:38:53 +02:00

.gitignore

…

Kconfig

jump_label: move 'asm goto' support test to Kconfig

2019-06-04 08:02:34 +02:00