diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /arch/sh/kernel/entry-common.S | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 1a5cf9dd82de..5b7efc4016fa 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
| @@ -372,7 +372,7 @@ syscall_exit: | |||
| 372 | 7: .long do_syscall_trace_enter | 372 | 7: .long do_syscall_trace_enter |
| 373 | 8: .long do_syscall_trace_leave | 373 | 8: .long do_syscall_trace_leave |
| 374 | 374 | ||
| 375 | #ifdef CONFIG_FTRACE | 375 | #ifdef CONFIG_FUNCTION_TRACER |
| 376 | .align 2 | 376 | .align 2 |
| 377 | .globl _mcount | 377 | .globl _mcount |
| 378 | .type _mcount,@function | 378 | .type _mcount,@function |
| @@ -414,4 +414,4 @@ skip_trace: | |||
| 414 | ftrace_stub: | 414 | ftrace_stub: |
| 415 | rts | 415 | rts |
| 416 | nop | 416 | nop |
| 417 | #endif /* CONFIG_FTRACE */ | 417 | #endif /* CONFIG_FUNCTION_TRACER */ |