projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[powerpc.git]
/
mm
/
tiny-shmem.c
diff --git
a/mm/tiny-shmem.c
b/mm/tiny-shmem.c
index
5f2cbf0
..
8803471
100644
(file)
--- a/
mm/tiny-shmem.c
+++ b/
mm/tiny-shmem.c
@@
-79,8
+79,8
@@
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
d_instantiate(dentry, inode);
inode->i_nlink = 0; /* It is unlinked */
d_instantiate(dentry, inode);
inode->i_nlink = 0; /* It is unlinked */
- file->f_
vfs
mnt = mntget(shm_mnt);
- file->f_dentry = dentry;
+ file->f_
path.
mnt = mntget(shm_mnt);
+ file->f_
path.
dentry = dentry;
file->f_mapping = inode->i_mapping;
file->f_op = &ramfs_file_operations;
file->f_mode = FMODE_WRITE | FMODE_READ;
file->f_mapping = inode->i_mapping;
file->f_op = &ramfs_file_operations;
file->f_mode = FMODE_WRITE | FMODE_READ;
@@
-126,6
+126,7
@@
int shmem_unuse(swp_entry_t entry, struct page *page)
return 0;
}
return 0;
}
+#if 0
int shmem_mmap(struct file *file, struct vm_area_struct *vma)
{
file_accessed(file);
int shmem_mmap(struct file *file, struct vm_area_struct *vma)
{
file_accessed(file);
@@
-135,6
+136,7
@@
int shmem_mmap(struct file *file, struct vm_area_struct *vma)
return 0;
#endif
}
return 0;
#endif
}
+#endif /* 0 */
#ifndef CONFIG_MMU
unsigned long shmem_get_unmapped_area(struct file *file,
#ifndef CONFIG_MMU
unsigned long shmem_get_unmapped_area(struct file *file,