Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel

2008-12-19 19:46:52 +00:00
parent 6fd7c7fe72 7971db5a4b
commit 828aac2ee2
8 changed files with 127 additions and 25 deletions
--- 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);