Commit 9cb8f069 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Linus Torvalds
Browse files

kernel: rename show_stack_loglvl() => show_stack() 



Now the last users of show_stack() got converted to use an explicit log
level, show_stack_loglvl() can drop it's redundant suffix and become once
again well known show_stack().

Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200418201944.482088-51-dima@arista.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fe1993a0

arch/alpha/kernel/traps.c

+1 −7
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ dik_show_trace(unsigned long *sp, const char *loglvl) 


static int kstack_depth_to_print = 24;



void show_stack_loglvl(struct task_struct *task, unsigned long *sp,

			const char *loglvl)

void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)

{

	unsigned long *stack;

	int i;
@@ -174,11 +173,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *sp, 
	dik_show_trace(sp, loglvl);

}



void show_stack(struct task_struct *task, unsigned long *sp)

{

	show_stack_loglvl(task, sp, KERN_DEFAULT);

}



void

die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)

{

arch/arc/kernel/stacktrace.c

+1 −7
Original line number Diff line number Diff line
@@ -228,17 +228,11 @@ noinline void show_stacktrace(struct task_struct *tsk, struct pt_regs *regs, 
EXPORT_SYMBOL(show_stacktrace);



/* Expected by sched Code */

void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,

			const char *loglvl)

void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)

{

	show_stacktrace(tsk, NULL, loglvl);

}



void show_stack(struct task_struct *tsk, unsigned long *sp)

{

	show_stack_loglvl(tsk, sp, KERN_DEFAULT);

}



/* Another API expected by schedular, shows up in "ps" as Wait Channel

 * Of course just returning schedule( ) would be pointless so unwind until

 * the function is not in schedular code

arch/arm/kernel/traps.c

+1 −7
Original line number Diff line number Diff line
@@ -247,18 +247,12 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk, 
}

#endif



void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,

		       const char *loglvl)

void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)

{

	dump_backtrace(NULL, tsk, loglvl);

	barrier();

}



void show_stack(struct task_struct *tsk, unsigned long *sp)

{

	show_stack_loglvl(tsk, sp, KERN_DEFAULT);

}



#ifdef CONFIG_PREEMPT

#define S_PREEMPT " PREEMPT"

#elif defined(CONFIG_PREEMPT_RT)

arch/arm64/kernel/traps.c

+1 −7
Original line number Diff line number Diff line
@@ -137,18 +137,12 @@ void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk, 
	put_task_stack(tsk);

}



void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,

		       const char *loglvl)

void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)

{

	dump_backtrace(NULL, tsk, loglvl);

	barrier();

}



void show_stack(struct task_struct *tsk, unsigned long *sp)

{

	show_stack_loglvl(tsk, sp, KERN_DEFAULT);

}



#ifdef CONFIG_PREEMPT

#define S_PREEMPT " PREEMPT"

#elif defined(CONFIG_PREEMPT_RT)

arch/c6x/kernel/traps.c

+1 −6
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static void show_trace(unsigned long *stack, unsigned long *endstack, 
	printk("%s\n", loglvl);

}



void show_stack_loglvl(struct task_struct *task, unsigned long *stack,

void show_stack(struct task_struct *task, unsigned long *stack,

		const char *loglvl)

{

	unsigned long *p, *endstack;
@@ -403,11 +403,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *stack, 
	show_trace(stack, endstack, loglvl);

}



void show_stack(struct task_struct *task, unsigned long *stack)

{

	show_stack_loglvl(task, stack, KERN_DEBUG);

}



int is_valid_bugaddr(unsigned long addr)

{

	return __kernel_text_address(addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE