Commit f1682e94 authored by Steve French's avatar Steve French

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parents 6910ab30 a0f06780
......@@ -22,6 +22,7 @@
#include <linux/pipe_fs_i.h>
#include <linux/mm_inline.h>
#include <linux/swap.h>
#include <linux/module.h>
/*
* Passed to the actors
......@@ -567,6 +568,9 @@ ssize_t generic_splice_sendpage(struct inode *inode, struct file *out,
return move_from_pipe(inode, out, len, flags, pipe_to_sendpage);
}
EXPORT_SYMBOL(generic_file_splice_write);
EXPORT_SYMBOL(generic_file_splice_read);
static long do_splice_from(struct inode *pipe, struct file *out, size_t len,
unsigned int flags)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment