diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-13 08:12:17 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-13 08:12:17 -0400 |
| commit | 7c7145f6acc68100dbdc5d3c5c64fe3af1c99c89 (patch) | |
| tree | 5e93e3eb4787229032f1df222fa490112f4b0c32 /fs/splice.c | |
| parent | 92d6b71ab906be706f3679353b30a8d2c3831144 (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'linus' into irq/core
Reason: Get the upstream IRQF_DISABLED related changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/splice.c b/fs/splice.c index 39208663aaf..9313b6124a2 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/syscalls.h> | 30 | #include <linux/syscalls.h> |
| 31 | #include <linux/uio.h> | 31 | #include <linux/uio.h> |
| 32 | #include <linux/security.h> | 32 | #include <linux/security.h> |
| 33 | #include <linux/gfp.h> | ||
| 33 | 34 | ||
| 34 | /* | 35 | /* |
| 35 | * Attempt to steal a page from a pipe buffer. This should perhaps go into | 36 | * Attempt to steal a page from a pipe buffer. This should perhaps go into |