Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3abcabe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "This includes a fix for a crash if certain special addresses are
  kprobed, plus does a rename of two Kconfig variables that were a minor
  misnomer"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS
  kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed
parents 500e1af2 9d020d33

Documentation/trace/kprobetrace.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ kprobes can probe (this means, all functions body except for __kprobes 
functions). Unlike the Tracepoint based event, this can be added and removed

dynamically, on the fly.



To enable this feature, build your kernel with CONFIG_KPROBE_EVENT=y.

To enable this feature, build your kernel with CONFIG_KPROBE_EVENTS=y.



Similar to the events tracer, this doesn't need to be activated via

current_tracer. Instead of that, add probe points via

Documentation/trace/uprobetracer.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
Overview

--------

Uprobe based trace events are similar to kprobe based trace events.

To enable this feature, build your kernel with CONFIG_UPROBE_EVENT=y.

To enable this feature, build your kernel with CONFIG_UPROBE_EVENTS=y.



Similar to the kprobe-event tracer, this doesn't need to be activated via

current_tracer. Instead of that, add probe points via

arch/s390/configs/default_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ CONFIG_SCHED_TRACER=y 
CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENT=y

CONFIG_UPROBE_EVENTS=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

arch/s390/configs/gcov_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ CONFIG_SCHED_TRACER=y 
CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENT=y

CONFIG_UPROBE_EVENTS=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

arch/s390/configs/performance_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ CONFIG_SCHED_TRACER=y 
CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENT=y

CONFIG_UPROBE_EVENTS=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y