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

Commit bac0c910 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/ftrace' into auto-ftrace-next

parents 6329d302 98a05ed4

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -528,6 +528,10 @@ KBUILD_CFLAGS += -g 
KBUILD_AFLAGS	+= -gdwarf-2

endif



ifdef CONFIG_FTRACE

KBUILD_CFLAGS	+= -pg

endif



# We trigger additional mismatches with less inlining

ifdef CONFIG_DEBUG_SECTION_MISMATCH

KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ config ARM 
	select HAVE_OPROFILE

	select HAVE_KPROBES if (!XIP_KERNEL)

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_FTRACE if (!XIP_KERNEL)

	select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and

arch/arm/boot/compressed/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ 


targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \

		 head.o misc.o $(OBJS)



ifeq ($(CONFIG_FTRACE),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif



EXTRA_CFLAGS  := -fpic -fno-builtin

EXTRA_AFLAGS  :=

arch/arm/kernel/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)



ifdef CONFIG_DYNAMIC_FTRACE

CFLAGS_REMOVE_ftrace.o = -pg

endif



# Object file lists.



obj-y		:= compat.o entry-armv.o entry-common.o irq.o \
@@ -18,6 +22,7 @@ obj-$(CONFIG_ARTHUR) += arthur.o 
obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_KPROBES)		+= kprobes.o kprobes-decode.o

obj-$(CONFIG_ATAGS_PROC)	+= atags.o

arch/arm/kernel/armksyms.c

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/io.h>

#include <asm/system.h>

#include <asm/uaccess.h>

#include <asm/ftrace.h>



/*

 * libgcc functions - functions that are used internally by the
@@ -181,3 +182,7 @@ EXPORT_SYMBOL(_find_next_bit_be); 
#endif



EXPORT_SYMBOL(copy_page);



#ifdef CONFIG_FTRACE

EXPORT_SYMBOL(mcount);

#endif