Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e92a3ba authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a302358

fs/ramfs/file-nommu.c

+6 −1
Original line number Diff line number Diff line
@@ -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)

{

	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;

}

ipc/shm.c

+2 −0
Original line number Diff line number Diff line
@@ -268,7 +268,9 @@ static int shm_mmap(struct file * file, struct vm_area_struct * vma) 
	if (ret != 0)

		return ret;

	sfd->vm_ops = vma->vm_ops;

#ifdef CONFIG_MMU

	BUG_ON(!sfd->vm_ops->fault);

#endif

	vma->vm_ops = &shm_vm_ops;

	shm_open(vma);