diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 14:23:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 14:23:14 -0400 |
| commit | b66e1f11ebc429569a3784aaf64123633d9e3ed1 (patch) | |
| tree | d49f96acc682aaf29416921428110da5fd78fea4 /kernel | |
| parent | 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851 (diff) | |
| parent | 5c598b3428c372a1209597cee99a70da20625876 (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:
[PATCH] fix sysctl_nr_open bugs
[PATCH] sanitize anon_inode_getfd()
[PATCH] split linux/file.h
[PATCH] make osf_select() use core_sys_select()
[PATCH] remove horrors with irix tty ioctls handling
[PATCH] fix file and descriptor handling in perfmon
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 1 | ||||
| -rw-r--r-- | kernel/fork.c | 1 | ||||
| -rw-r--r-- | kernel/kmod.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index d3ad54677f9c..1510f78a0ffa 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/acct.h> | 19 | #include <linux/acct.h> |
| 20 | #include <linux/tsacct_kern.h> | 20 | #include <linux/tsacct_kern.h> |
| 21 | #include <linux/file.h> | 21 | #include <linux/file.h> |
| 22 | #include <linux/fdtable.h> | ||
| 22 | #include <linux/binfmts.h> | 23 | #include <linux/binfmts.h> |
| 23 | #include <linux/nsproxy.h> | 24 | #include <linux/nsproxy.h> |
| 24 | #include <linux/pid_namespace.h> | 25 | #include <linux/pid_namespace.h> |
diff --git a/kernel/fork.c b/kernel/fork.c index 2bb675af4de3..933e60ebccae 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/mempolicy.h> | 22 | #include <linux/mempolicy.h> |
| 23 | #include <linux/sem.h> | 23 | #include <linux/sem.h> |
| 24 | #include <linux/file.h> | 24 | #include <linux/file.h> |
| 25 | #include <linux/fdtable.h> | ||
| 25 | #include <linux/key.h> | 26 | #include <linux/key.h> |
| 26 | #include <linux/binfmts.h> | 27 | #include <linux/binfmts.h> |
| 27 | #include <linux/mman.h> | 28 | #include <linux/mman.h> |
diff --git a/kernel/kmod.c b/kernel/kmod.c index e2764047ec03..8df97d3dfda8 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/mnt_namespace.h> | 27 | #include <linux/mnt_namespace.h> |
| 28 | #include <linux/completion.h> | 28 | #include <linux/completion.h> |
| 29 | #include <linux/file.h> | 29 | #include <linux/file.h> |
| 30 | #include <linux/fdtable.h> | ||
| 30 | #include <linux/workqueue.h> | 31 | #include <linux/workqueue.h> |
| 31 | #include <linux/security.h> | 32 | #include <linux/security.h> |
| 32 | #include <linux/mount.h> | 33 | #include <linux/mount.h> |
