2 files changed, 6 insertions, 2 deletions

diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index 13d295506a17..276863dc4bdd 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -514,11 +514,13 @@ bad_area_nosemaphore:
 #ifdef CONFIG_X86_32
                         "%s%s[%d]: segfault at %lx ip %08lx sp %08lx error %lx",
 #else
-                        "%s%s[%d]: segfault at %lx ip %lx sp %lx error %lx\n",
+                        "%s%s[%d]: segfault at %lx ip %lx sp %lx error %lx",
 #endif
                         task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
                         tsk->comm, task_pid_nr(tsk), address, regs->ip,
                         regs->sp, error_code);
+                        print_vma_addr(" in ", regs->ip);
+                        printk("\n");
                 }
                 tsk->thread.cr2 = address;
                 /* Kernel addresses are always protection faults */
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index b606bdefbb72..9ef0306efe9e 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -552,11 +552,13 @@ bad_area_nosemaphore:
 #ifdef CONFIG_X86_32
                         "%s%s[%d]: segfault at %lx ip %08lx sp %08lx error %lx",
 #else
-                        "%s%s[%d]: segfault at %lx ip %lx sp %lx error %lx\n",
+                        "%s%s[%d]: segfault at %lx ip %lx sp %lx error %lx",
 #endif
                         task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
                         tsk->comm, task_pid_nr(tsk), address, regs->ip,
                         regs->sp, error_code);
+                        print_vma_addr(" in ", regs->ip);
+                        printk("\n");
                 }
 
                 tsk->thread.cr2 = address;