xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/process: Remove unnecessary #ifdef CONFIG_FUNCTION_GRAPH_TRACER

Browse Source 
ftrace_graph_ret_addr() is always defined and returns 'ip' when
CONFIG_FUNCTION GRAPH_TRACER is not set.

So the #ifdef is not needed, remove it.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/9d11143d4e27ba8274369a926968756917584868.1597643153.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy
2020-08-17 05:46:39 +00:00
committed by Michael Ellerman
parent 2f279eeb68
commit 353bce211e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/process.c
View File

@@ -2096,10 +2096,8 @@ void show_stack(struct task_struct *tsk, unsigned long *stack,
unsigned long sp, ip, lr, newsp; unsigned long sp, ip, lr, newsp;
int count = 0; int count = 0;
int firstframe = 1; int firstframe = 1;
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
unsigned long ret_addr; unsigned long ret_addr;
int ftrace_idx = 0; int ftrace_idx = 0;
#endif
if (tsk == NULL) if (tsk == NULL)
tsk = current; tsk = current;
@@ -2127,12 +2125,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack,
if (!firstframe || ip != lr) { if (!firstframe || ip != lr) {
printk("%s["REG"] ["REG"] %pS", printk("%s["REG"] ["REG"] %pS",
loglvl, sp, ip, (void *)ip); loglvl, sp, ip, (void *)ip);
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
ret_addr = ftrace_graph_ret_addr(current, ret_addr = ftrace_graph_ret_addr(current,
&ftrace_idx, ip, stack); &ftrace_idx, ip, stack);
if (ret_addr != ip) if (ret_addr != ip)
pr_cont(" (%pS)", (void *)ret_addr); pr_cont(" (%pS)", (void *)ret_addr);
#endif
if (firstframe) if (firstframe)
pr_cont(" (unreliable)"); pr_cont(" (unreliable)");
pr_cont("\n"); pr_cont("\n");