aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fs.h1
-rw-r--r--include/linux/integrity.h6
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8f7fc8db4679..88157253b9e6 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1582,6 +1582,7 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
1582 struct iovec *fast_pointer, 1582 struct iovec *fast_pointer,
1583 struct iovec **ret_pointer); 1583 struct iovec **ret_pointer);
1584 1584
1585extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
1585extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); 1586extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
1586extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); 1587extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
1587extern ssize_t vfs_readv(struct file *, const struct iovec __user *, 1588extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
diff --git a/include/linux/integrity.h b/include/linux/integrity.h
index 83222cebd47b..c2d6082a1a4c 100644
--- a/include/linux/integrity.h
+++ b/include/linux/integrity.h
@@ -24,6 +24,7 @@ enum integrity_status {
24#ifdef CONFIG_INTEGRITY 24#ifdef CONFIG_INTEGRITY
25extern struct integrity_iint_cache *integrity_inode_get(struct inode *inode); 25extern struct integrity_iint_cache *integrity_inode_get(struct inode *inode);
26extern void integrity_inode_free(struct inode *inode); 26extern void integrity_inode_free(struct inode *inode);
27extern void __init integrity_load_keys(void);
27 28
28#else 29#else
29static inline struct integrity_iint_cache * 30static inline struct integrity_iint_cache *
@@ -36,5 +37,10 @@ static inline void integrity_inode_free(struct inode *inode)
36{ 37{
37 return; 38 return;
38} 39}
40
41static inline void integrity_load_keys(void)
42{
43}
39#endif /* CONFIG_INTEGRITY */ 44#endif /* CONFIG_INTEGRITY */
45
40#endif /* _LINUX_INTEGRITY_H */ 46#endif /* _LINUX_INTEGRITY_H */