diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /arch/mips/mm/fault.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/mips/mm/fault.c')
| -rw-r--r-- | arch/mips/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index e3a617224868..a4f8c45c4e8e 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c | |||
| @@ -89,7 +89,7 @@ good_area: | |||
| 89 | if (!(vma->vm_flags & VM_WRITE)) | 89 | if (!(vma->vm_flags & VM_WRITE)) |
| 90 | goto bad_area; | 90 | goto bad_area; |
| 91 | } else { | 91 | } else { |
| 92 | if (!(vma->vm_flags & (VM_READ | VM_EXEC))) | 92 | if (!(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))) |
| 93 | goto bad_area; | 93 | goto bad_area; |
| 94 | } | 94 | } |
| 95 | 95 | ||