diff options
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/shm.c | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -157,14 +157,22 @@ static void shm_close (struct vm_area_struct *shmd) | |||
157 | 157 | ||
158 | static int shm_mmap(struct file * file, struct vm_area_struct * vma) | 158 | static int shm_mmap(struct file * file, struct vm_area_struct * vma) |
159 | { | 159 | { |
160 | file_accessed(file); | 160 | int ret; |
161 | vma->vm_ops = &shm_vm_ops; | 161 | |
162 | shm_inc(file->f_dentry->d_inode->i_ino); | 162 | ret = shmem_mmap(file, vma); |
163 | return 0; | 163 | if (ret == 0) { |
164 | vma->vm_ops = &shm_vm_ops; | ||
165 | shm_inc(file->f_dentry->d_inode->i_ino); | ||
166 | } | ||
167 | |||
168 | return ret; | ||
164 | } | 169 | } |
165 | 170 | ||
166 | static struct file_operations shm_file_operations = { | 171 | static struct file_operations shm_file_operations = { |
167 | .mmap = shm_mmap | 172 | .mmap = shm_mmap, |
173 | #ifndef CONFIG_MMU | ||
174 | .get_unmapped_area = shmem_get_unmapped_area, | ||
175 | #endif | ||
168 | }; | 176 | }; |
169 | 177 | ||
170 | static struct vm_operations_struct shm_vm_ops = { | 178 | static struct vm_operations_struct shm_vm_ops = { |