Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[firefly-linux-kernel-4.4.55.git] / arch / sparc / mm / fault_64.c

diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index e9268ea1a68de5364d468973e61b3cbd232c19c9..dbabe5713a158eec17eb61de90d1cdfd6e974e80 100644 (file)
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -413,8 +413,9 @@ good_area:
         * that here.
         */
        if ((fault_code & FAULT_CODE_ITLB) && !(vma->vm_flags & VM_EXEC)) {
-               BUG_ON(address != regs->tpc);
-               BUG_ON(regs->tstate & TSTATE_PRIV);
+               WARN(address != regs->tpc,
+                    "address (%lx) != regs->tpc (%lx)\n", address, regs->tpc);
+               WARN_ON(regs->tstate & TSTATE_PRIV);
                goto bad_area;
        }