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

[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@suse.com>

---
 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);

[tip:x86/debug] x86: Move call to print_modules() out of show_regs ()

[tip-bot for Jan Beulich]

Commit-ID:  0fa0e2f02e8edfbdb5f86d1cab0fa6dc0517489f
Gitweb:     http://git.kernel.org/tip/0fa0e2f02e8edfbdb5f86d1cab0fa6dc0517489f
Author:     Jan Beulich <JBeulich@suse.com>
AuthorDate: Mon, 18 Jun 2012 11:40:04 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 20 Jun 2012 14:33:48 +0200

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: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/4FDF21A4020000780008A67F@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/dumpstack.c    |    1 +
 arch/x86/kernel/dumpstack_32.c |    1 -
 arch/x86/kernel/dumpstack_64.c |    1 -
 3 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 87d3b5d..ae42418b 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -271,6 +271,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
 			current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)
 		return 1;
 
+	print_modules();
 	show_regs(regs);
 #ifdef CONFIG_X86_32
 	if (user_mode_vm(regs)) {
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index 3a8aced..1038a41 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/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));
 
 	pr_emerg("Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index c582e9c..b653675 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/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(KERN_DEFAULT "Process %s (pid: %d, threadinfo %p, task %p)\n",
 	       cur->comm, cur->pid, task_thread_info(cur), cur);