2 files changed, 12 insertions, 18 deletions

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 83a9bbbbe38f..b132d3957dfc 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -398,31 +398,24 @@ void die(const char * str, struct pt_regs * regs, long err)
                 local_save_flags(flags);
 
         if (++die.lock_owner_depth < 3) {
-                int nl = 0;
                 unsigned long esp;
                 unsigned short ss;
 
                 report_bug(regs->eip, regs);
 
-                printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
+                printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff,
+                       ++die_counter);
 #ifdef CONFIG_PREEMPT
-                printk(KERN_EMERG "PREEMPT ");
-                nl = 1;
+                printk("PREEMPT ");
 #endif
 #ifdef CONFIG_SMP
-                if (!nl)
-                        printk(KERN_EMERG);
                 printk("SMP ");
-                nl = 1;
 #endif
 #ifdef CONFIG_DEBUG_PAGEALLOC
-                if (!nl)
-                        printk(KERN_EMERG);
                 printk("DEBUG_PAGEALLOC");
-                nl = 1;
 #endif
-                if (nl)
-                        printk("\n");
+                printk("\n");
+
                 if (notify_die(DIE_OOPS, str, regs, err,
                                         current->thread.trap_no, SIGSEGV) !=
                                 NOTIFY_STOP) {
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index c686ae20fd6b..d84314ce22bb 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -539,23 +539,22 @@ no_context:
                         printk(KERN_ALERT "BUG: unable to handle kernel paging"
                                         " request");
                 printk(" at virtual address %08lx\n",address);
-                printk(KERN_ALERT " printing eip:\n");
-                printk("%08lx\n", regs->eip);
+                printk(KERN_ALERT "printing eip: %08lx ", regs->eip);
 
                 page = read_cr3();
                 page = ((__typeof__(page) *) __va(page))[address >> PGDIR_SHIFT];
 #ifdef CONFIG_X86_PAE
-                printk(KERN_ALERT "*pdpt = %016Lx\n", page);
+                printk("*pdpt = %016Lx ", page);
                 if ((page >> PAGE_SHIFT) < max_low_pfn
                     && page & _PAGE_PRESENT) {
                         page &= PAGE_MASK;
                         page = ((__typeof__(page) *) __va(page))[(address >> PMD_SHIFT)
                                                                  & (PTRS_PER_PMD - 1)];
-                        printk(KERN_ALERT "*pde = %016Lx\n", page);
+                        printk(KERN_ALERT "*pde = %016Lx ", page);
                         page &= ~_PAGE_NX;
                 }
 #else
-                printk(KERN_ALERT "*pde = %08lx\n", page);
+                printk("*pde = %08lx ", page);
 #endif
 
                 /*
@@ -569,8 +568,10 @@ no_context:
                         page &= PAGE_MASK;
                         page = ((__typeof__(page) *) __va(page))[(address >> PAGE_SHIFT)
                                                                  & (PTRS_PER_PTE - 1)];
-                        printk(KERN_ALERT "*pte = %0*Lx\n", sizeof(page)*2, (u64)page);
+                        printk("*pte = %0*Lx ", sizeof(page)*2, (u64)page);
                 }
+
+                printk("\n");
         }
 
         tsk->thread.cr2 = address;