Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 0 insertions, 24 deletions

diff --git a/fs/fs_struct.c b/fs/fs_struct.c
index 5df4775fea03..fe6ca583bbc0 100644
--- a/fs/fs_struct.c
+++ b/fs/fs_struct.c
@@ -164,27 +164,3 @@ struct fs_struct init_fs = {
         .seq            = SEQCNT_ZERO,
         .umask          = 0022,
 };
-
-void daemonize_fs_struct(void)
-{
-        struct fs_struct *fs = current->fs;
-
-        if (fs) {
-                int kill;
-
-                task_lock(current);
-
-                spin_lock(&init_fs.lock);
-                init_fs.users++;
-                spin_unlock(&init_fs.lock);
-
-                spin_lock(&fs->lock);
-                current->fs = &init_fs;
-                kill = !--fs->users;
-                spin_unlock(&fs->lock);
-
-                task_unlock(current);
-                if (kill)
-                        free_fs_struct(fs);
-        }
-}