[PATCH] hot-add-mem x86_64: fixup externs

[pandora-kernel.git] / mm / tiny-shmem.c

diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index cdc6d43..5f2cbf0 100644 (file)
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -12,7 +12,6 @@
 
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/vfs.h>
 #include <linux/mount.h>
 #include <linux/file.h>
@@ -33,9 +32,6 @@ static int __init init_tmpfs(void)
 {
        BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
 
-#ifdef CONFIG_TMPFS
-       devfs_mk_dir("shm");
-#endif
        shm_mnt = kern_mount(&tmpfs_fs_type);
        BUG_ON(IS_ERR(shm_mnt));
 
@@ -90,7 +86,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
        file->f_mode = FMODE_WRITE | FMODE_READ;
 
        /* notify everyone as to the change of file size */
-       error = do_truncate(dentry, size, file);
+       error = do_truncate(dentry, size, 0, file);
        if (error < 0)
                goto close_file;