Commit 353bce21 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/process: Remove unnecessary #ifdef CONFIG_FUNCTION_GRAPH_TRACER 



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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/9d11143d4e27ba8274369a926968756917584868.1597643153.git.christophe.leroy@csgroup.eu
parent 2f279eeb

arch/powerpc/kernel/process.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -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");