mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/Makefile Merge reason: We need to be uptodate with the perf events development branch because we plan to rewrite the breakpoints API on top of perf events.
This commit is contained in:
commit
0f8f86c7bd
7303 changed files with 758772 additions and 375701 deletions
|
|
@ -7,12 +7,6 @@ menuconfig SAMPLES
|
|||
|
||||
if SAMPLES
|
||||
|
||||
config SAMPLE_MARKERS
|
||||
tristate "Build markers examples -- loadable modules only"
|
||||
depends on MARKERS && m
|
||||
help
|
||||
This build markers example modules.
|
||||
|
||||
config SAMPLE_TRACEPOINTS
|
||||
tristate "Build tracepoints examples -- loadable modules only"
|
||||
depends on TRACEPOINTS && m
|
||||
|
|
|
|||
Loading…
Reference in a new issue