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

Signed-off-by: Steve French <sfrench@us.ibm.com>

+4
+4
fs/splice.c
··· 22 #include <linux/pipe_fs_i.h> 23 #include <linux/mm_inline.h> 24 #include <linux/swap.h> 25 26 /* 27 * Passed to the actors ··· 567 { 568 return move_from_pipe(inode, out, len, flags, pipe_to_sendpage); 569 } 570 571 static long do_splice_from(struct inode *pipe, struct file *out, size_t len, 572 unsigned int flags)
··· 22 #include <linux/pipe_fs_i.h> 23 #include <linux/mm_inline.h> 24 #include <linux/swap.h> 25 + #include <linux/module.h> 26 27 /* 28 * Passed to the actors ··· 566 { 567 return move_from_pipe(inode, out, len, flags, pipe_to_sendpage); 568 } 569 + 570 + EXPORT_SYMBOL(generic_file_splice_write); 571 + EXPORT_SYMBOL(generic_file_splice_read); 572 573 static long do_splice_from(struct inode *pipe, struct file *out, size_t len, 574 unsigned int flags)