 +++ b/include/linux/splice.h
 @@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
  extern void splice_shrink_spd(struct pipe_inode_info *,
-                                struct splice_pipe_desc *);
+ 				struct splice_pipe_desc *);
  
 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+                          loff_t *ppos, size_t len, unsigned int flags);
++			   loff_t *ppos, size_t len, unsigned int flags);
 +extern long do_splice_to(struct file *in, loff_t *ppos,
-+                        struct pipe_inode_info *pipe, size_t len,
-+                        unsigned int flags);
++			 struct pipe_inode_info *pipe, size_t len,
++			 unsigned int flags);
 +
  #endif
-
 aufs2 standalone patch for linux-2.6.35
 
 diff --git a/fs/namei.c b/fs/namei.c

--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
        }
        return ret;
 }
+EXPORT_SYMBOL(cap_file_mmap);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c

 {
@@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask)
 {
 	return security_ops->file_permission(file, mask);
 }
+EXPORT_SYMBOL(security_file_permission);
 
 int security_file_alloc(struct file *file)
 {
@@ -649,6 +661,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
 		return ret;
 	return ima_file_mmap(file, prot);
 }
+EXPORT_SYMBOL(security_file_mmap);
 
 int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
 			    unsigned long prot)
