diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:38:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:38:16 -0800 |
commit | c3abcabe813b4a0976b58f7e6c1e63b2070c8dda (patch) | |
tree | 72d7719e484340ddca3d5cf2710823f25a5d6542 /arch/s390/defconfig | |
parent | Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | Merge branch 'linus' into perf/urgent, to resolve conflict (diff) | |
download | linux-c3abcabe813b4a0976b58f7e6c1e63b2070c8dda.tar.gz linux-c3abcabe813b4a0976b58f7e6c1e63b2070c8dda.tar.bz2 linux-c3abcabe813b4a0976b58f7e6c1e63b2070c8dda.zip |
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
Diffstat (limited to 'arch/s390/defconfig')
-rw-r--r-- | arch/s390/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 68bfd09f1b02..97189dbaf34b 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig @@ -179,7 +179,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y CONFIG_FUNCTION_PROFILER=y CONFIG_TRACE_ENUM_MAP_FILE=y CONFIG_KPROBES_SANITY_TEST=y |