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

Commit 83cf1eec authored by Russell King's avatar Russell King
Browse files

Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable

parents f1690d17 0e341af8

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config ARM 
	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)

	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)

	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)

	select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config STRICT_DEVMEM 
config FRAME_POINTER

	bool

	depends on !THUMB2_KERNEL

	default y if !ARM_UNWIND

	default y if !ARM_UNWIND || FUNCTION_GRAPH_TRACER

	help

	  If you say N here, the resulting kernel will be slightly smaller and

	  faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,

arch/arm/include/asm/system.h

+5 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ 
#include <asm/outercache.h>



#define __exception	__attribute__((section(".exception.text")))

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#define __exception_irq_entry	__irq_entry

#else

#define __exception_irq_entry	__exception

#endif



struct thread_info;

struct task_struct;

arch/arm/include/asm/traps.h

+21 −2
Original line number Diff line number Diff line
@@ -15,13 +15,32 @@ struct undef_hook { 
void register_undef_hook(struct undef_hook *hook);

void unregister_undef_hook(struct undef_hook *hook);



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

static inline int __in_irqentry_text(unsigned long ptr)

{

	extern char __irqentry_text_start[];

	extern char __irqentry_text_end[];



	return ptr >= (unsigned long)&__irqentry_text_start &&

	       ptr < (unsigned long)&__irqentry_text_end;

}

#else

static inline int __in_irqentry_text(unsigned long ptr)

{

	return 0;

}

#endif



static inline int in_exception_text(unsigned long ptr)

{

	extern char __exception_text_start[];

	extern char __exception_text_end[];

	int in;



	return ptr >= (unsigned long)&__exception_text_start &&

	in = ptr >= (unsigned long)&__exception_text_start &&

	     ptr < (unsigned long)&__exception_text_end;



	return in ? : __in_irqentry_text(ptr);

}



extern void __init early_trap_init(void);

arch/arm/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)

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



ifdef CONFIG_DYNAMIC_FTRACE

ifdef CONFIG_FUNCTION_TRACER

CFLAGS_REMOVE_ftrace.o = -pg

endif
@@ -33,6 +33,7 @@ obj-$(CONFIG_SMP) += smp.o 
obj-$(CONFIG_HAVE_ARM_SCU)	+= smp_scu.o

obj-$(CONFIG_HAVE_ARM_TWD)	+= smp_twd.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= 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