diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /include/asm-sparc64/ftrace.h | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sparc64/ftrace.h')
| -rw-r--r-- | include/asm-sparc64/ftrace.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-sparc64/ftrace.h b/include/asm-sparc64/ftrace.h deleted file mode 100644 index d27716cd38c1..000000000000 --- a/include/asm-sparc64/ftrace.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #ifndef _ASM_SPARC64_FTRACE | ||
| 2 | #define _ASM_SPARC64_FTRACE | ||
| 3 | |||
| 4 | #ifdef CONFIG_MCOUNT | ||
| 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_SPARC64_FTRACE */ | ||