2 files changed, 26 insertions, 16 deletions

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 1b7ad4115d8..de5386b01d3 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -352,6 +352,8 @@ void die(const char * str, struct pt_regs * regs, long err)
         static int die_counter;
         unsigned long flags;
 
+        oops_enter();
+
         if (die.lock_owner != raw_smp_processor_id()) {
                 console_verbose();
                 spin_lock_irqsave(&die.lock, flags);
@@ -404,6 +406,7 @@ void die(const char * str, struct pt_regs * regs, long err)
                 ssleep(5);
                 panic("Fatal exception");
         }
+        oops_exit();
         do_exit(SIGSEGV);
 }
 
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index 47a3b72ec7b..7f0fcf219a2 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -509,24 +509,31 @@ no_context:
 
         bust_spinlocks(1);
 
-#ifdef CONFIG_X86_PAE
-        if (error_code & 16) {
-                pte_t *pte = lookup_address(address);
-
-                if (pte && pte_present(*pte) && !pte_exec_kernel(*pte))
-                        printk(KERN_CRIT "kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n", current->uid);
+        if (oops_may_print()) {
+        #ifdef CONFIG_X86_PAE
+                if (error_code & 16) {
+                        pte_t *pte = lookup_address(address);
+
+                        if (pte && pte_present(*pte) && !pte_exec_kernel(*pte))
+                                printk(KERN_CRIT "kernel tried to execute "
+                                        "NX-protected page - exploit attempt? "
+                                        "(uid: %d)\n", current->uid);
+                }
+        #endif
+                if (address < PAGE_SIZE)
+                        printk(KERN_ALERT "BUG: unable to handle kernel NULL "
+                                        "pointer dereference");
+                else
+                        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);
         }
-#endif
-        if (address < PAGE_SIZE)
-                printk(KERN_ALERT "BUG: unable to handle kernel NULL pointer dereference");
-        else
-                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);
         page = read_cr3();
         page = ((unsigned long *) __va(page))[address >> 22];
-        printk(KERN_ALERT "*pde = %08lx\n", page);
+        if (oops_may_print())
+                printk(KERN_ALERT "*pde = %08lx\n", page);
         /*
          * We must not directly access the pte in the highpte
          * case, the page table might be allocated in highmem.
@@ -534,7 +541,7 @@ no_context:
          * it's allocated already.
          */
 #ifndef CONFIG_HIGHPTE
-        if (page & 1) {
+        if ((page & 1) && oops_may_print()) {
                 page &= PAGE_MASK;
                 address &= 0x003ff000;
                 page = ((unsigned long *) __va(page))[address >> PAGE_SHIFT];