diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/shmem.c | 5 | ||||
-rw-r--r-- | mm/tiny-shmem.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 882053031aa0..fcb07882c8e0 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -1228,7 +1228,8 @@ failed: | |||
1228 | return error; | 1228 | return error; |
1229 | } | 1229 | } |
1230 | 1230 | ||
1231 | struct page *shmem_nopage(struct vm_area_struct *vma, unsigned long address, int *type) | 1231 | static struct page *shmem_nopage(struct vm_area_struct *vma, |
1232 | unsigned long address, int *type) | ||
1232 | { | 1233 | { |
1233 | struct inode *inode = vma->vm_file->f_path.dentry->d_inode; | 1234 | struct inode *inode = vma->vm_file->f_path.dentry->d_inode; |
1234 | struct page *page = NULL; | 1235 | struct page *page = NULL; |
@@ -1335,7 +1336,7 @@ out_nomem: | |||
1335 | return retval; | 1336 | return retval; |
1336 | } | 1337 | } |
1337 | 1338 | ||
1338 | int shmem_mmap(struct file *file, struct vm_area_struct *vma) | 1339 | static int shmem_mmap(struct file *file, struct vm_area_struct *vma) |
1339 | { | 1340 | { |
1340 | file_accessed(file); | 1341 | file_accessed(file); |
1341 | vma->vm_ops = &shmem_vm_ops; | 1342 | vma->vm_ops = &shmem_vm_ops; |
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c index c7f6e1914bc4..8803471593fd 100644 --- a/mm/tiny-shmem.c +++ b/mm/tiny-shmem.c | |||
@@ -126,6 +126,7 @@ int shmem_unuse(swp_entry_t entry, struct page *page) | |||
126 | return 0; | 126 | return 0; |
127 | } | 127 | } |
128 | 128 | ||
129 | #if 0 | ||
129 | int shmem_mmap(struct file *file, struct vm_area_struct *vma) | 130 | int shmem_mmap(struct file *file, struct vm_area_struct *vma) |
130 | { | 131 | { |
131 | file_accessed(file); | 132 | file_accessed(file); |
@@ -135,6 +136,7 @@ int shmem_mmap(struct file *file, struct vm_area_struct *vma) | |||
135 | return 0; | 136 | return 0; |
136 | #endif | 137 | #endif |
137 | } | 138 | } |
139 | #endif /* 0 */ | ||
138 | 140 | ||
139 | #ifndef CONFIG_MMU | 141 | #ifndef CONFIG_MMU |
140 | unsigned long shmem_get_unmapped_area(struct file *file, | 142 | unsigned long shmem_get_unmapped_area(struct file *file, |