diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-02-22 08:58:50 -0800 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-03-25 20:28:11 -0400 |
| commit | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (patch) | |
| tree | 6210d9452c526157744b0d83454eaea20bcf9a0e /kernel | |
| parent | 04b2fa9f8f36ec6fb6fd1c9dc9df6fff0cd27323 (diff) | |
| download | op-kernel-dev-e2e40f2c1ed433c5e224525c8c862fd32e5d3df2.zip op-kernel-dev-e2e40f2c1ed433c5e224525c8c862fd32e5d3df2.tar.gz | |
fs: move struct kiocb to fs.h
struct kiocb now is a generic I/O container, so move it to fs.h.
Also do a #include diet for aio.h while we're at it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/printk.c | 2 | ||||
| -rw-r--r-- | kernel/sysctl.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 60b2aa2..40d50cc 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -32,7 +32,6 @@ #include <linux/security.h> #include <linux/bootmem.h> #include <linux/memblock.h> -#include <linux/aio.h> #include <linux/syscalls.h> #include <linux/kexec.h> #include <linux/kdb.h> @@ -46,6 +45,7 @@ #include <linux/irq_work.h> #include <linux/utsname.h> #include <linux/ctype.h> +#include <linux/uio.h> #include <asm/uaccess.h> diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 88ea2d6..83d907a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -19,6 +19,7 @@ */ #include <linux/module.h> +#include <linux/aio.h> #include <linux/mm.h> #include <linux/swap.h> #include <linux/slab.h> |
