aboutsummaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2007-07-31 00:37:24 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 15:39:36 -0700
commit2e92a3baee64112fd210a930276bad165b0bd576 (patch)
tree00e9e59fe3fe4ce84d2fb00b134a02a9137acdc7 /ipc
parent6a302358d87fedaf7bda12b8e909265ebf1ce674 (diff)
downloadlinaro-lsk-2e92a3baee64112fd210a930276bad165b0bd576.tar.gz
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 'ipc')
-rw-r--r--ipc/shm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index d0259e3ad1c..d88ac5a07ec 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -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);