commit d7f7aa95f8240bfe35d5a64d2c261db23f2e9994
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 01 05:07:43 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 01 05:07:40 2013 -0700
tree 3971731c2d4903308b13045ac729972a3c0e9978
parent 9b955dee1a89891a445b1a71628a52e24f8857b6
parent f1db931b819472bc3b8e247621721a3dd46562de

Merge "mm: panic on the first bad page table entry access"

mm/memory.c

diff --git a/mm/memory.c b/mm/memory.c
index b6ab040..acc9aa6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -58,6 +58,7 @@
 #include <linux/swapops.h>
 #include <linux/elf.h>
 #include <linux/gfp.h>
+#include <linux/bug.h>
 
 #include <asm/io.h>
 #include <asm/pgalloc.h>
@@ -705,6 +706,9 @@
 	if (vma->vm_file && vma->vm_file->f_op)
 		print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n",
 				(unsigned long)vma->vm_file->f_op->mmap);
+
+	BUG_ON(PANIC_CORRUPTION);
+
 	dump_stack();
 	add_taint(TAINT_BAD_PAGE);
 }