Commit af64a7cb authored by Jiri Slaby's avatar Jiri Slaby Committed by Steven Rostedt

ftrace: Pass retval through return in ftrace_dyn_arch_init()

No architecture uses the "data" parameter in ftrace_dyn_arch_init() in any
way, it just sets the value to 0. And this is used as a return value
in the caller -- ftrace_init, which just checks the retval against
zero.

Note there is also "return 0" in every ftrace_dyn_arch_init.  So it is
enough to check the retval and remove all the indirect sets of data on
all archs.

Link: http://lkml.kernel.org/r/1393268401-24379-3-git-send-email-jslaby@suse.cz

Cc: linux-arch@vger.kernel.org
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent c867ccd8
...@@ -360,9 +360,6 @@ function below should be sufficient for most people: ...@@ -360,9 +360,6 @@ function below should be sufficient for most people:
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
/* return value is done indirectly via data */
*(unsigned long *)data = 0;
return 0; return 0;
} }
......
...@@ -158,8 +158,6 @@ int ftrace_make_nop(struct module *mod, ...@@ -158,8 +158,6 @@ int ftrace_make_nop(struct module *mod,
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
*(unsigned long *)data = 0;
return 0; return 0;
} }
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
......
...@@ -67,9 +67,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func) ...@@ -67,9 +67,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
/* return value is done indirectly via data */
*(unsigned long *)data = 0;
return 0; return 0;
} }
......
...@@ -200,7 +200,5 @@ int ftrace_update_ftrace_func(ftrace_func_t func) ...@@ -200,7 +200,5 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
/* run from kstop_machine */ /* run from kstop_machine */
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
*(unsigned long *)data = 0;
return 0; return 0;
} }
...@@ -119,8 +119,5 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) ...@@ -119,8 +119,5 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
/* run from kstop_machine */ /* run from kstop_machine */
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
/* The return code is returned via data */
writel(0, data);
return 0; return 0;
} }
...@@ -173,9 +173,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) ...@@ -173,9 +173,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
/* The return code is retured via data */
*(unsigned long *)data = 0;
return 0; return 0;
} }
......
...@@ -206,9 +206,6 @@ int __init ftrace_dyn_arch_init(void *data) ...@@ -206,9 +206,6 @@ int __init ftrace_dyn_arch_init(void *data)
/* Remove "b ftrace_stub" to ensure ftrace_caller() is executed */ /* Remove "b ftrace_stub" to ensure ftrace_caller() is executed */
ftrace_modify_code(MCOUNT_ADDR, INSN_NOP); ftrace_modify_code(MCOUNT_ADDR, INSN_NOP);
/* The return code is retured via data */
*(unsigned long *)data = 0;
return 0; return 0;
} }
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
......
...@@ -533,11 +533,6 @@ void arch_ftrace_update_code(int command) ...@@ -533,11 +533,6 @@ void arch_ftrace_update_code(int command)
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
/* caller expects data to be zero */
unsigned long *p = data;
*p = 0;
return 0; return 0;
} }
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
......
...@@ -132,7 +132,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func) ...@@ -132,7 +132,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
*(unsigned long *) data = 0;
return 0; return 0;
} }
......
...@@ -274,9 +274,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) ...@@ -274,9 +274,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
/* The return code is retured via data */
__raw_writel(0, (unsigned long)data);
return 0; return 0;
} }
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
......
...@@ -84,10 +84,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func) ...@@ -84,10 +84,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
unsigned long *p = data;
*p = 0;
return 0; return 0;
} }
#endif #endif
......
...@@ -169,8 +169,6 @@ int ftrace_make_nop(struct module *mod, ...@@ -169,8 +169,6 @@ int ftrace_make_nop(struct module *mod,
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
*(unsigned long *)data = 0;
return 0; return 0;
} }
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
......
...@@ -670,9 +670,6 @@ void arch_ftrace_update_code(int command) ...@@ -670,9 +670,6 @@ void arch_ftrace_update_code(int command)
int __init ftrace_dyn_arch_init(void *data) int __init ftrace_dyn_arch_init(void *data)
{ {
/* The return code is retured via data */
*(unsigned long *)data = 0;
return 0; return 0;
} }
#endif #endif
......
...@@ -4379,11 +4379,9 @@ void __init ftrace_init(void) ...@@ -4379,11 +4379,9 @@ void __init ftrace_init(void)
addr = (unsigned long)ftrace_stub; addr = (unsigned long)ftrace_stub;
local_irq_save(flags); local_irq_save(flags);
ftrace_dyn_arch_init(&addr); ret = ftrace_dyn_arch_init(&addr);
local_irq_restore(flags); local_irq_restore(flags);
if (ret)
/* ftrace_dyn_arch_init places the return code in addr */
if (addr)
goto failed; goto failed;
count = __stop_mcount_loc - __start_mcount_loc; count = __stop_mcount_loc - __start_mcount_loc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment