lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NOMMU: Fix SYSV IPC SHM

Browse Source 
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>
This commit is contained in:
David Howells
2007-07-31 00:37:24 -07:00
committed by Linus Torvalds
parent 6a302358d8
commit 2e92a3baee
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ramfs/file-nommu.c
View File

@@ -295,5 +295,10 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
*/ */
int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma) int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma)
{ {
return vma->vm_flags & VM_SHARED ? 0 : -ENOSYS; if (!(vma->vm_flags & VM_SHARED))
return -ENOSYS;
file_accessed(file);
vma->vm_ops = &generic_file_vm_ops;
return 0;
} }

2
ipc/shm.c
View File

@@ -268,7 +268,9 @@ static int shm_mmap(struct file * file, struct vm_area_struct * vma)
if (ret != 0) if (ret != 0)
return ret; return ret;
sfd->vm_ops = vma->vm_ops; sfd->vm_ops = vma->vm_ops;
#ifdef CONFIG_MMU
BUG_ON(!sfd->vm_ops->fault); BUG_ON(!sfd->vm_ops->fault);
#endif
vma->vm_ops = &shm_vm_ops; vma->vm_ops = &shm_vm_ops;
shm_open(vma); shm_open(vma);