diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /arch/arm/include | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index 584ef9a8e5a5..39c8bc1a006a 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _ASM_ARM_FTRACE | 1 | #ifndef _ASM_ARM_FTRACE |
| 2 | #define _ASM_ARM_FTRACE | 2 | #define _ASM_ARM_FTRACE |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_FTRACE | 4 | #ifdef CONFIG_FUNCTION_TRACER |
| 5 | #define MCOUNT_ADDR ((long)(mcount)) | 5 | #define MCOUNT_ADDR ((long)(mcount)) |
| 6 | #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ | 6 | #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ |
| 7 | 7 | ||