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

Commit 3bef4447 authored by Brian Gerst's avatar Brian Gerst Committed by H. Peter Anvin
Browse files

x86: Merge show_regs() 



Using kernel_stack_pointer() allows 32-bit and 64-bit versions to
be merged.  This is more correct for 64-bit, since the old %rsp is
always saved on the stack.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
LKML-Reference: <1263397555-27695-1-git-send-email-brgerst@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 2ca49b2f

arch/x86/kernel/process.c

+7 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ void exit_thread(void) 
	}

}



void show_regs(struct pt_regs *regs)

{

	show_registers(regs);

	show_trace(NULL, regs, (unsigned long *)kernel_stack_pointer(regs),

		   regs->bp);

}



void show_regs_common(void)

{

	const char *board, *product;

arch/x86/kernel/process_32.c

+0 −6
Original line number Diff line number Diff line
@@ -174,12 +174,6 @@ void __show_regs(struct pt_regs *regs, int all) 
			d6, d7);

}



void show_regs(struct pt_regs *regs)

{

	show_registers(regs);

	show_trace(NULL, regs, &regs->sp, regs->bp);

}



void release_thread(struct task_struct *dead_task)

{

	BUG_ON(dead_task->mm);

arch/x86/kernel/process_64.c

+0 −6
Original line number Diff line number Diff line
@@ -211,12 +211,6 @@ void __show_regs(struct pt_regs *regs, int all) 
	printk(KERN_INFO "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);

}



void show_regs(struct pt_regs *regs)

{

	show_registers(regs);

	show_trace(NULL, regs, (void *)(regs + 1), regs->bp);

}



void release_thread(struct task_struct *dead_task)

{

	if (dead_task->mm) {