diff options
| author | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
|---|---|---|
| committer | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
| commit | 7971db5a4b4176ad5df590fce07a962c643a2740 (patch) | |
| tree | 6ad8e09c5376c4e4c532c3411b0171ba1011acd9 /arch/arm/kernel | |
| parent | d403700bf8fc903584e830967f5d64075770848c (diff) | |
| parent | c4edfced662fa64deeed89c7d8c9f96d86130c19 (diff) | |
Merge branch 'for-rmk-misc' into for-rmk
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 4 | ||||
| -rw-r--r-- | arch/arm/kernel/ftrace.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index c74f766ffc1..23af3c972c9 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user); EXPORT_SYMBOL(__strncpy_from_user); #ifdef CONFIG_MMU +EXPORT_SYMBOL(copy_page); + EXPORT_SYMBOL(__copy_from_user); EXPORT_SYMBOL(__copy_to_user); EXPORT_SYMBOL(__clear_user); @@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be); EXPORT_SYMBOL(_find_next_bit_be); #endif -EXPORT_SYMBOL(copy_page); - #ifdef CONFIG_FUNCTION_TRACER EXPORT_SYMBOL(mcount); #endif diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 6c90479e897..c6384276622 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) return ret; } -/* run from kstop_machine */ +/* run from ftrace_init with irqs disabled */ int __init ftrace_dyn_arch_init(void *data) { ftrace_mcount_set(data); |