diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c (patch) | |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc /include/asm-powerpc/ftrace.h | |
| parent | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-powerpc/ftrace.h')
| -rw-r--r-- | include/asm-powerpc/ftrace.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-powerpc/ftrace.h b/include/asm-powerpc/ftrace.h new file mode 100644 index 000000000000..de921326cca8 --- /dev/null +++ b/include/asm-powerpc/ftrace.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | #ifndef _ASM_POWERPC_FTRACE | ||
| 2 | #define _ASM_POWERPC_FTRACE | ||
| 3 | |||
| 4 | #ifdef CONFIG_FTRACE | ||
| 5 | #define MCOUNT_ADDR ((long)(_mcount)) | ||
| 6 | #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ | ||
| 7 | |||
| 8 | #ifndef __ASSEMBLY__ | ||
| 9 | extern void _mcount(void); | ||
| 10 | #endif | ||
| 11 | |||
| 12 | #endif | ||
| 13 | |||
| 14 | #endif /* _ASM_POWERPC_FTRACE */ | ||