git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 693713cbdb3a4bda5a8a678c31f06560bbb14657
Jiri Kosina (1):
livepatch: Remove klp_check_compiler_support()
Linus Torvalds (1):
tracing: Simplify "if" macro code
Steven Rostedt (VMware) (3):
ftrace/x86_32: Remove support for non DYNAMIC_FTRACE
ftrace/x86: Remove mcount support
x86: Hide the int3_emulate_call/jmp functions from UML
----
arch/powerpc/include/asm/livepatch.h | 5 ---
arch/s390/include/asm/livepatch.h | 5 ---
arch/x86/Kconfig | 11 ++++++
arch/x86/include/asm/ftrace.h | 8 ++--
arch/x86/include/asm/livepatch.h | 8 ----
arch/x86/include/asm/text-patching.h | 4 +-
arch/x86/kernel/ftrace_32.S | 75 +++---------------------------------
arch/x86/kernel/ftrace_64.S | 28 +-------------
include/linux/compiler.h | 35 +++++++++--------
kernel/livepatch/core.c | 8 ----
10 files changed, 41 insertions(+), 146 deletions(-)
