dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Browse source
This commit is contained in:
Ingo Molnar 2009-03-02 23:14:02 +01:00
commit 654952bcb9
14 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/alpha/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/avr32/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/blackfin/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/cris/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/h8300/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/m68k/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/mips/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/parisc/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/um/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
arch/xtensa/include/asm/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
include/asm-frv/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
include/asm-m32r/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

1
include/asm-mn10300/ftrace.h Normal file
View file

@ -0,0 +1 @@
/* empty */

41
include/linux/ftrace.h
View file

@ -11,6 +11,8 @@
#include <linux/bitops.h>
#include <linux/sched.h>
#include <asm/ftrace.h>
#ifdef CONFIG_FUNCTION_TRACER
extern int ftrace_enabled;
@ -103,8 +105,6 @@ struct ftrace_func_command {
};
#ifdef CONFIG_DYNAMIC_FTRACE
/* asm/ftrace.h must be defined for archs supporting dynamic ftrace */
#include <asm/ftrace.h>
int ftrace_arch_code_modify_prepare(void);
int ftrace_arch_code_modify_post_process(void);
@ -282,24 +282,25 @@ static inline void __ftrace_enabled_restore(int enabled)
#endif
}
#ifdef CONFIG_FRAME_POINTER
/* TODO: need to fix this for ARM */
# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
# define CALLER_ADDR1 ((unsigned long)__builtin_return_address(1))
# define CALLER_ADDR2 ((unsigned long)__builtin_return_address(2))
# define CALLER_ADDR3 ((unsigned long)__builtin_return_address(3))
# define CALLER_ADDR4 ((unsigned long)__builtin_return_address(4))
# define CALLER_ADDR5 ((unsigned long)__builtin_return_address(5))
# define CALLER_ADDR6 ((unsigned long)__builtin_return_address(6))
#else
# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
# define CALLER_ADDR1 0UL
# define CALLER_ADDR2 0UL
# define CALLER_ADDR3 0UL
# define CALLER_ADDR4 0UL
# define CALLER_ADDR5 0UL
# define CALLER_ADDR6 0UL
#endif
#ifndef HAVE_ARCH_CALLER_ADDR
# ifdef CONFIG_FRAME_POINTER
# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
# define CALLER_ADDR1 ((unsigned long)__builtin_return_address(1))
# define CALLER_ADDR2 ((unsigned long)__builtin_return_address(2))
# define CALLER_ADDR3 ((unsigned long)__builtin_return_address(3))
# define CALLER_ADDR4 ((unsigned long)__builtin_return_address(4))
# define CALLER_ADDR5 ((unsigned long)__builtin_return_address(5))
# define CALLER_ADDR6 ((unsigned long)__builtin_return_address(6))
# else
# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
# define CALLER_ADDR1 0UL
# define CALLER_ADDR2 0UL
# define CALLER_ADDR3 0UL
# define CALLER_ADDR4 0UL
# define CALLER_ADDR5 0UL
# define CALLER_ADDR6 0UL
# endif
#endif /* ifndef HAVE_ARCH_CALLER_ADDR */
#ifdef CONFIG_IRQSOFF_TRACER
extern void time_hardirqs_on(unsigned long a0, unsigned long a1);