mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Jiri Slaby 2014-02-24 19:59:58 +01:00 committed by Steven Rostedt
parent c867ccd838
commit af64a7cb09
14 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/trace/ftrace-design.txt
View File

@ -360,9 +360,6 @@ function below should be sufficient for most people:
int __init ftrace_dyn_arch_init(void *data)
{
/* return value is done indirectly via data */
*(unsigned long *)data = 0;
return 0;
}

2
arch/arm/kernel/ftrace.c
View File

@ -158,8 +158,6 @@ int ftrace_make_nop(struct module *mod,
int __init ftrace_dyn_arch_init(void *data)
{
*(unsigned long *)data = 0;
return 0;
}
#endif /* CONFIG_DYNAMIC_FTRACE */

3
arch/blackfin/kernel/ftrace.c
View File

@ -67,9 +67,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
int __init ftrace_dyn_arch_init(void *data)
{
/* return value is done indirectly via data */
*(unsigned long *)data = 0;
return 0;
}

2
arch/ia64/kernel/ftrace.c
View File

@ -200,7 +200,5 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
/* run from kstop_machine */
int __init ftrace_dyn_arch_init(void *data)
{
*(unsigned long *)data = 0;
return 0;
}

3
arch/metag/kernel/ftrace.c
View File

@ -119,8 +119,5 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
/* run from kstop_machine */
int __init ftrace_dyn_arch_init(void *data)
{
/* The return code is returned via data */
writel(0, data);
return 0;
}

3
arch/microblaze/kernel/ftrace.c
View File

@ -173,9 +173,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
int __init ftrace_dyn_arch_init(void *data)
{
/* The return code is retured via data */
*(unsigned long *)data = 0;
return 0;
}

3
arch/mips/kernel/ftrace.c
View File

@ -206,9 +206,6 @@ int __init ftrace_dyn_arch_init(void *data)
/* Remove "b ftrace_stub" to ensure ftrace_caller() is executed */
ftrace_modify_code(MCOUNT_ADDR, INSN_NOP);
/* The return code is retured via data */
*(unsigned long *)data = 0;
return 0;
}
#endif /* CONFIG_DYNAMIC_FTRACE */

5
arch/powerpc/kernel/ftrace.c
View File

@ -533,11 +533,6 @@ void arch_ftrace_update_code(int command)
int __init ftrace_dyn_arch_init(void *data)
{
/* caller expects data to be zero */
unsigned long *p = data;
*p = 0;
return 0;
}
#endif /* CONFIG_DYNAMIC_FTRACE */

1
arch/s390/kernel/ftrace.c
View File

@ -132,7 +132,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
int __init ftrace_dyn_arch_init(void *data)
{
*(unsigned long *) data = 0;
return 0;
}

3
arch/sh/kernel/ftrace.c
View File

@ -274,9 +274,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
int __init ftrace_dyn_arch_init(void *data)
{
/* The return code is retured via data */
__raw_writel(0, (unsigned long)data);
return 0;
}
#endif /* CONFIG_DYNAMIC_FTRACE */

4
arch/sparc/kernel/ftrace.c
View File

@ -84,10 +84,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
int __init ftrace_dyn_arch_init(void *data)
{
unsigned long *p = data;
*p = 0;
return 0;
}
#endif

2
arch/tile/kernel/ftrace.c
View File

@ -169,8 +169,6 @@ int ftrace_make_nop(struct module *mod,
int __init ftrace_dyn_arch_init(void *data)
{
*(unsigned long *)data = 0;
return 0;
}
#endif /* CONFIG_DYNAMIC_FTRACE */

3
arch/x86/kernel/ftrace.c
View File

@ -670,9 +670,6 @@ void arch_ftrace_update_code(int command)
int __init ftrace_dyn_arch_init(void *data)
{
/* The return code is retured via data */
*(unsigned long *)data = 0;
return 0;
}
#endif

6
kernel/trace/ftrace.c
View File

@ -4379,11 +4379,9 @@ void __init ftrace_init(void)
addr = (unsigned long)ftrace_stub;
local_irq_save(flags);
ftrace_dyn_arch_init(&addr);
ret = ftrace_dyn_arch_init(&addr);
local_irq_restore(flags);
/* ftrace_dyn_arch_init places the return code in addr */
if (addr)
if (ret)
goto failed;
count = __stop_mcount_loc - __start_mcount_loc;