aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2007-07-31 03:37:24 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 18:39:36 -0400
commit2e92a3baee64112fd210a930276bad165b0bd576 (patch)
tree00e9e59fe3fe4ce84d2fb00b134a02a9137acdc7 /fs
parent6a302358d87fedaf7bda12b8e909265ebf1ce674 (diff)
NOMMU: Fix SYSV IPC SHM
Fix the SYSV IPC SHM to work with the changes applied by the new fault handler patches when CONFIG_MMU=n. Signed-off-by: David Howells <dhowells@redhat.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ramfs/file-nommu.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index cad2b7ace630..237fe8b8e819 100644
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -295,5 +295,10 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
295 */ 295 */
296int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma) 296int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma)
297{ 297{
298 return vma->vm_flags & VM_SHARED ? 0 : -ENOSYS; 298 if (!(vma->vm_flags & VM_SHARED))
299 return -ENOSYS;
300
301 file_accessed(file);
302 vma->vm_ops = &generic_file_vm_ops;
303 return 0;
299} 304}