diff options
author | David Howells <dhowells@redhat.com> | 2007-07-31 03:37:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:39:36 -0400 |
commit | 2e92a3baee64112fd210a930276bad165b0bd576 (patch) | |
tree | 00e9e59fe3fe4ce84d2fb00b134a02a9137acdc7 /ipc | |
parent | 6a302358d87fedaf7bda12b8e909265ebf1ce674 (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 'ipc')
-rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -268,7 +268,9 @@ static int shm_mmap(struct file * file, struct vm_area_struct * vma) | |||
268 | if (ret != 0) | 268 | if (ret != 0) |
269 | return ret; | 269 | return ret; |
270 | sfd->vm_ops = vma->vm_ops; | 270 | sfd->vm_ops = vma->vm_ops; |
271 | #ifdef CONFIG_MMU | ||
271 | BUG_ON(!sfd->vm_ops->fault); | 272 | BUG_ON(!sfd->vm_ops->fault); |
273 | #endif | ||
272 | vma->vm_ops = &shm_vm_ops; | 274 | vma->vm_ops = &shm_vm_ops; |
273 | shm_open(vma); | 275 | shm_open(vma); |
274 | 276 | ||