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

Commit 4913ae39 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core' of... 

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

 into perf/core

Pull tracing updates from Steve Rostedt.

This commit:

      tracing: Remove the extra 4 bytes of padding in events

changes the ABI. All involved parties seem to agree that it's safe to
do now, but the devil is in the details ...

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ff7532ca 0b07436d

arch/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ config OPTPROBES 
	depends on KPROBES && HAVE_OPTPROBES

	depends on !PREEMPT



config KPROBES_ON_FTRACE

	def_bool y

	depends on KPROBES && HAVE_KPROBES_ON_FTRACE

	depends on DYNAMIC_FTRACE_WITH_REGS

	help

	 If function tracer is enabled and the arch supports full

	 passing of pt_regs to function tracing, then kprobes can

	 optimize on top of function tracing.



config UPROBES

	bool "Transparent user-space probes (EXPERIMENTAL)"

	depends on UPROBE_EVENT && PERF_EVENTS
@@ -158,6 +167,9 @@ config HAVE_KRETPROBES 
config HAVE_OPTPROBES

	bool



config HAVE_KPROBES_ON_FTRACE

	bool



config HAVE_NMI_WATCHDOG

	bool

#

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -40,10 +40,12 @@ config X86 
	select HAVE_DMA_CONTIGUOUS if !SWIOTLB

	select HAVE_KRETPROBES

	select HAVE_OPTPROBES

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FENTRY if X86_64

	select HAVE_C_RECORDMCOUNT

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_FP_TEST

arch/x86/include/asm/ftrace.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 


#ifdef CONFIG_DYNAMIC_FTRACE

#define ARCH_SUPPORTS_FTRACE_OPS 1

#define ARCH_SUPPORTS_FTRACE_SAVE_REGS

#endif



#ifndef __ASSEMBLY__

arch/x86/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ obj-$(CONFIG_X86_TSC) += trace_clock.o 
obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o

obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_OPTPROBES)		+= kprobes-opt.o

obj-y				+= kprobes/

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault_32.o

obj-$(CONFIG_KGDB)		+= kgdb.o

arch/x86/kernel/kprobes/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Makefile for kernel probes

#



obj-$(CONFIG_KPROBES)		+= core.o

obj-$(CONFIG_OPTPROBES)		+= opt.o

obj-$(CONFIG_KPROBES_ON_FTRACE)	+= ftrace.o