[PATCH] x86: move call to print_modules() out of show_regs()

[Jan Beulich]

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: Jan Beulich <jbeulich@xxxxxxxx>

---
 arch/x86/kernel/dumpstack.c    |    1 +
 arch/x86/kernel/dumpstack_32.c |    1 -
 arch/x86/kernel/dumpstack_64.c |    1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

--- 3.5-rc3/arch/x86/kernel/dumpstack.c
+++ 3.5-rc3-x86-show_regs-no-print-modules/arch/x86/kernel/dumpstack.c
@@ -271,6 +271,7 @@ int __kprobes __die(const char *str, str
 			current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)
 		return 1;
 
+	print_modules();
 	show_regs(regs);
 #ifdef CONFIG_X86_32
 	if (user_mode_vm(regs)) {
--- 3.5-rc3/arch/x86/kernel/dumpstack_32.c
+++ 3.5-rc3-x86-show_regs-no-print-modules/arch/x86/kernel/dumpstack_32.c
@@ -86,7 +86,6 @@ void show_regs(struct pt_regs *regs)
 {
 	int i;
 
-	print_modules();
 	__show_regs(regs, !user_mode_vm(regs));
 
 	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",
--- 3.5-rc3/arch/x86/kernel/dumpstack_64.c
+++ 3.5-rc3-x86-show_regs-no-print-modules/arch/x86/kernel/dumpstack_64.c
@@ -254,7 +254,6 @@ void show_regs(struct pt_regs *regs)
 
 	sp = regs->sp;
 	printk("CPU %d ", cpu);
-	print_modules();
 	__show_regs(regs, 1);
 	printk("Process %s (pid: %d, threadinfo %p, task %p)\n",
 		cur->comm, cur->pid, task_thread_info(cur), cur);



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/