Title: [6940] branches/2009R1/arch/blackfin: Fix bug [#5153], let ltp testcase mmap05 pass for MPU on branch
- Revision
- 6940
- Author
- gyang
- Date
- 2009-07-07 04:33:38 -0500 (Tue, 07 Jul 2009)
Log Message
Fix bug [#5153], let ltp testcase mmap05 pass for MPU on branch
Modified Paths
Diff
Modified: branches/2009R1/arch/blackfin/include/asm/mmu_context.h (6939 => 6940)
--- branches/2009R1/arch/blackfin/include/asm/mmu_context.h 2009-07-07 09:32:21 UTC (rev 6939)
+++ branches/2009R1/arch/blackfin/include/asm/mmu_context.h 2009-07-07 09:33:38 UTC (rev 6940)
@@ -127,17 +127,17 @@
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;
Modified: branches/2009R1/arch/blackfin/kernel/traps.c (6939 => 6940)
--- branches/2009R1/arch/blackfin/kernel/traps.c 2009-07-07 09:32:21 UTC (rev 6939)
+++ branches/2009R1/arch/blackfin/kernel/traps.c 2009-07-07 09:33:38 UTC (rev 6940)
@@ -395,7 +395,7 @@
/* 0x23 - Data CPLB protection violation, handled here */
case VEC_CPLB_VL:
info.si_code = ILL_CPLB_VI;
- sig = SIGBUS;
+ sig = SIGSEGV;
verbose_printk(KERN_NOTICE EXC_0x23(KERN_NOTICE));
CHK_DEBUGGER_TRAP_MAYBE();
break;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits