diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-19 14:46:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-19 14:46:52 -0500 |
| commit | 828aac2ee239dca9c1856c4856a57912e6a487c4 (patch) | |
| tree | 44de8a7d318bbcef29da00992ebfa7356f470af7 /arch/arm/kernel | |
| parent | 6fd7c7fe72a46dfd227fe8db0c7b6863af90a982 (diff) | |
| parent | 7971db5a4b4176ad5df590fce07a962c643a2740 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 6c90479e8974..c63842766229 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c | |||
| @@ -95,7 +95,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func) | |||
| 95 | return ret; | 95 | return ret; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | /* run from kstop_machine */ | 98 | /* run from ftrace_init with irqs disabled */ |
| 99 | int __init ftrace_dyn_arch_init(void *data) | 99 | int __init ftrace_dyn_arch_init(void *data) |
| 100 | { | 100 | { |
| 101 | ftrace_mcount_set(data); | 101 | ftrace_mcount_set(data); |