diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 00:09:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 00:09:10 -0400 |
| commit | 8fe74cf053de7ad2124a894996f84fa890a81093 (patch) | |
| tree | 77dcd8fbf33ce53a3821942233962fb28c6f2848 /init | |
| parent | c2eb2fa6d2b6fe122d3479ec5b28d978418b2698 (diff) | |
| parent | ced117c73edc917e96dea7cca98c91383f0792f7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Remove two unneeded exports and make two symbols static in fs/mpage.c
Cleanup after commit 585d3bc06f4ca57f975a5a1f698f65a45ea66225
Trim includes of fdtable.h
Don't crap into descriptor table in binfmt_som
Trim includes in binfmt_elf
Don't mess with descriptor table in load_elf_binary()
Get rid of indirect include of fs_struct.h
New helper - current_umask()
check_unsafe_exec() doesn't care about signal handlers sharing
New locking/refcounting for fs_struct
Take fs_struct handling to new file (fs/fs_struct.c)
Get rid of bumping fs_struct refcount in pivot_root(2)
Kill unsharing fs_struct in __set_personality()
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 8d4ff5afc1d8..dd7ee5f203f3 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
| 15 | #include <linux/initrd.h> | 15 | #include <linux/initrd.h> |
| 16 | #include <linux/async.h> | 16 | #include <linux/async.h> |
| 17 | #include <linux/fs_struct.h> | ||
| 17 | 18 | ||
| 18 | #include <linux/nfs_fs.h> | 19 | #include <linux/nfs_fs.h> |
| 19 | #include <linux/nfs_fs_sb.h> | 20 | #include <linux/nfs_fs_sb.h> |