Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a8ff54c authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Ingo Molnar
Browse files

x86/dumpstack: Remove unnecessary stack pointer arguments 



When calling show_stack_log_lvl() or dump_trace() with a regs argument,
providing a stack pointer or frame pointer is redundant.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com&gt;d>
Reviewed-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Byungchul Park <byungchul.park@lge.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nilay Vaish <nilayvaish@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1694e2e955e3b9a73a3c3d5ba2634344014dd550.1472057064.git.jpoimboe@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 4b8afafb

arch/x86/kernel/dumpstack.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void show_stack(struct task_struct *task, unsigned long *sp) 


void show_stack_regs(struct pt_regs *regs)

{

	show_stack_log_lvl(current, regs, (unsigned long *)regs->sp, regs->bp, "");

	show_stack_log_lvl(current, regs, NULL, 0, "");

}



static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;

arch/x86/kernel/dumpstack_32.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void show_regs(struct pt_regs *regs) 
		u8 *ip;



		pr_emerg("Stack:\n");

		show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);

		show_stack_log_lvl(NULL, regs, NULL, 0, KERN_EMERG);



		pr_emerg("Code:");

arch/x86/kernel/dumpstack_64.c

+1 −4
Original line number Diff line number Diff line
@@ -283,9 +283,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
void show_regs(struct pt_regs *regs)

{

	int i;

	unsigned long sp;



	sp = regs->sp;

	show_regs_print_info(KERN_DEFAULT);

	__show_regs(regs, 1);
@@ -300,8 +298,7 @@ void show_regs(struct pt_regs *regs) 
		u8 *ip;



		printk(KERN_DEFAULT "Stack:\n");

		show_stack_log_lvl(NULL, regs, (unsigned long *)sp,

				   0, KERN_DEFAULT);

		show_stack_log_lvl(NULL, regs, NULL, 0, KERN_DEFAULT);



		printk(KERN_DEFAULT "Code: ");

arch/x86/oprofile/backtrace.c

+1 −4
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) 
	struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);



	if (!user_mode(regs)) {

		unsigned long stack = kernel_stack_pointer(regs);



		if (!depth)

			return;
@@ -122,8 +120,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) 
		if (!--depth)

			return;



		dump_trace(NULL, regs, (unsigned long *)stack, 0,

			   &backtrace_ops, &depth);

		dump_trace(NULL, regs, NULL, 0, &backtrace_ops, &depth);

		return;

	}