diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /arch/sparc64/lib/mcount.S | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc64/lib/mcount.S')
| -rw-r--r-- | arch/sparc64/lib/mcount.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S index fad90ddb3a28..7ce9c65f3592 100644 --- a/arch/sparc64/lib/mcount.S +++ b/arch/sparc64/lib/mcount.S | |||
| @@ -93,7 +93,7 @@ mcount: | |||
| 93 | nop | 93 | nop |
| 94 | 1: | 94 | 1: |
| 95 | #endif | 95 | #endif |
| 96 | #ifdef CONFIG_FTRACE | 96 | #ifdef CONFIG_FUNCTION_TRACER |
| 97 | #ifdef CONFIG_DYNAMIC_FTRACE | 97 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 98 | mov %o7, %o0 | 98 | mov %o7, %o0 |
| 99 | .globl mcount_call | 99 | .globl mcount_call |
| @@ -119,7 +119,7 @@ mcount_call: | |||
| 119 | .size _mcount,.-_mcount | 119 | .size _mcount,.-_mcount |
| 120 | .size mcount,.-mcount | 120 | .size mcount,.-mcount |
| 121 | 121 | ||
| 122 | #ifdef CONFIG_FTRACE | 122 | #ifdef CONFIG_FUNCTION_TRACER |
| 123 | .globl ftrace_stub | 123 | .globl ftrace_stub |
| 124 | .type ftrace_stub,#function | 124 | .type ftrace_stub,#function |
| 125 | ftrace_stub: | 125 | ftrace_stub: |