---

yaml --- r: 312408 b: refs/heads/master c: 0fa0e2f h: refs/heads/master v: v3
git-mirror · Jun 20, 2012 · bd2977a · bd2977a
1 parent c387050
commit bd2977a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d26d1d873a302828e064737746c53a2689e6c0f
+refs/heads/master: 0fa0e2f02e8edfbdb5f86d1cab0fa6dc0517489f
diff --git a/trunk/arch/x86/kernel/dumpstack.c b/trunk/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/trunk/arch/x86/kernel/dumpstack_32.c b/trunk/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/trunk/arch/x86/kernel/dumpstack_64.c b/trunk/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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -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",
@@ Expand Down @@