diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
tree | 5e32586114534ed3f2165614cba3d578f5d87307 /arch/mips/mm/fault.c | |
parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) |
Merge branch 'master' into gfs2
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 | ||