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

Commit 0fa0e2f0 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: Move call to print_modules() out of show_regs() 



Printing the list of loaded modules is really unrelated to what
this function is about, and is particularly unnecessary in the
context of the SysRQ key handling (gets printed so far over and
over).

It should really be the caller of the function to decide whether
this piece of information is useful (and to avoid redundantly
printing it).

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/4FDF21A4020000780008A67F@nat28.tlf.novell.com


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

arch/x86/kernel/dumpstack.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -271,6 +271,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
			current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)

			current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)

		return 1;

		return 1;





	print_modules();

	show_regs(regs);

	show_regs(regs);

#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

	if (user_mode_vm(regs)) {

	if (user_mode_vm(regs)) {

arch/x86/kernel/dumpstack_32.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,6 @@ void show_regs(struct pt_regs *regs) 
{

{

	int i;

	int i;





	print_modules();

	__show_regs(regs, !user_mode_vm(regs));

	__show_regs(regs, !user_mode_vm(regs));





	pr_emerg("Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",

	pr_emerg("Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",

arch/x86/kernel/dumpstack_64.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -254,7 +254,6 @@ void show_regs(struct pt_regs *regs) 




	sp = regs->sp;

	sp = regs->sp;

	printk("CPU %d ", cpu);

	printk("CPU %d ", cpu);

	print_modules();

	__show_regs(regs, 1);

	__show_regs(regs, 1);

	printk(KERN_DEFAULT "Process %s (pid: %d, threadinfo %p, task %p)\n",

	printk(KERN_DEFAULT "Process %s (pid: %d, threadinfo %p, task %p)\n",

	       cur->comm, cur->pid, task_thread_info(cur), cur);

	       cur->comm, cur->pid, task_thread_info(cur), cur);