Ingo Molnar 666fab4a3e Merge branch 'linus' into perf/kprobes ...

Conflicts:
	include/asm-generic/atomic-instrumented.h
	kernel/kprobes.c

Use the upstream atomic-instrumented.h checksum, and pick
the kprobes version of kernel/kprobes.c, which effectively
reverts this upstream workaround:

  645f224e7b: ("kprobes: Tell lockdep about kprobe nesting")

Since the new code *should* be fine without nesting.

Knock on wood ...

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

2020-11-07 13:20:17 +01:00

5.0 KiB

Executable File

Raw Blame History

View Raw