commit 2e92a3baee64112fd210a930276bad165b0bd576
author David Howells <dhowells@redhat.com> Tue Jul 31 00:37:24 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jul 31 15:39:36 2007 -0700
tree 00e9e59fe3fe4ce84d2fb00b134a02a9137acdc7
parent 6a302358d87fedaf7bda12b8e909265ebf1ce674

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>

ipc/shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index d0259e3..d88ac5a 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -268,7 +268,9 @@
 	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);