2 files changed, 4 insertions, 4 deletions

diff --git a/arch/blackfin/include/asm/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h
index 944e29faae48..040410bb07e1 100644
--- a/arch/blackfin/include/asm/mmu_context.h
+++ b/arch/blackfin/include/asm/mmu_context.h
@@ -127,17 +127,17 @@ static inline void protect_page(struct mm_struct *mm, unsigned long addr,
         unsigned long idx = page >> 5;
         unsigned long bit = 1 << (page & 31);
 
-        if (flags & VM_MAYREAD)
+        if (flags & VM_READ)
                 mask[idx] |= bit;
         else
                 mask[idx] &= ~bit;
         mask += page_mask_nelts;
-        if (flags & VM_MAYWRITE)
+        if (flags & VM_WRITE)
                 mask[idx] |= bit;
         else
                 mask[idx] &= ~bit;
         mask += page_mask_nelts;
-        if (flags & VM_MAYEXEC)
+        if (flags & VM_EXEC)
                 mask[idx] |= bit;
         else
                 mask[idx] &= ~bit;
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 18c6cd4150f8..644e35e33553 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -411,7 +411,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
         /* 0x23 - Data CPLB protection violation, handled here */
         case VEC_CPLB_VL:
                 info.si_code = ILL_CPLB_VI;
-                sig = SIGBUS;
+                sig = SIGSEGV;
                 strerror = KERN_NOTICE EXC_0x23(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;