git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ../mmc
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
ftrace.c
diff --git
a/arch/arm/kernel/ftrace.c
b/arch/arm/kernel/ftrace.c
index
6c90479
..
c638427
100644
(file)
--- 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);