Merge branch 'linus' into tracing/core
Merge reason: merge latest tracing fixes to avoid conflicts in kernel/trace/trace_events_filter.c with upcoming change Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -808,6 +808,14 @@ config KALLSYMS_EXTRA_PASS
|
||||
you wait for kallsyms to be fixed.
|
||||
|
||||
|
||||
config STRIP_ASM_SYMS
|
||||
bool "Strip assembler-generated symbols during link"
|
||||
default n
|
||||
help
|
||||
Strip internal assembler-generated symbols during a link (symbols
|
||||
that look like '.Lxxx') so they don't pollute the output of
|
||||
get_wchan() and suchlike.
|
||||
|
||||
config HOTPLUG
|
||||
bool "Support for hot-pluggable devices" if EMBEDDED
|
||||
default y
|
||||
|
Reference in New Issue
Block a user