diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
| commit | 0c8c708a7e6b52556ee9079041f504191ec5f0e9 (patch) | |
| tree | fb8da2f5e70ac1d21d41d5a900e48d42c1c999eb /include/asm-x86/ftrace.h | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
| parent | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (diff) | |
Merge branch 'x86/core' into x86/unify-cpu-detect
Diffstat (limited to 'include/asm-x86/ftrace.h')
| -rw-r--r-- | include/asm-x86/ftrace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/ftrace.h b/include/asm-x86/ftrace.h index 5c68b32ee1c8..be0e004ad148 100644 --- a/include/asm-x86/ftrace.h +++ b/include/asm-x86/ftrace.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_X86_FTRACE | 1 | #ifndef ASM_X86__FTRACE_H |
| 2 | #define _ASM_X86_FTRACE | 2 | #define ASM_X86__FTRACE_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_FTRACE | 4 | #ifdef CONFIG_FTRACE |
| 5 | #define MCOUNT_ADDR ((long)(mcount)) | 5 | #define MCOUNT_ADDR ((long)(mcount)) |
| @@ -11,4 +11,4 @@ extern void mcount(void); | |||
| 11 | 11 | ||
| 12 | #endif /* CONFIG_FTRACE */ | 12 | #endif /* CONFIG_FTRACE */ |
| 13 | 13 | ||
| 14 | #endif /* _ASM_X86_FTRACE */ | 14 | #endif /* ASM_X86__FTRACE_H */ |