diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 22:44:18 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 22:44:18 +0100 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /mm/tiny-shmem.c | |
| parent | [POWERPC] scanlog_init cleanup and minor fixes (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-54f53f2b94feb72622bec7a8563fc487d9f97720.tar.xz linux-54f53f2b94feb72622bec7a8563fc487d9f97720.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'mm/tiny-shmem.c')
| -rw-r--r-- | mm/tiny-shmem.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c index 702083638c16..f0f55875dd6a 100644 --- a/mm/tiny-shmem.c +++ b/mm/tiny-shmem.c @@ -39,12 +39,11 @@ static int __init init_tmpfs(void) } module_init(init_tmpfs) -/* +/** * shmem_file_setup - get an unlinked file living in tmpfs - * * @name: name for dentry (to be seen in /proc/<pid>/maps * @size: size to be set for the file - * + * @flags: vm_flags */ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) { @@ -95,9 +94,8 @@ put_memory: return ERR_PTR(error); } -/* +/** * shmem_zero_setup - setup a shared anonymous mapping - * * @vma: the vma to be mmapped is prepared by do_mmap_pgoff */ int shmem_zero_setup(struct vm_area_struct *vma) |