Merge remote-tracking branch 'security/next'

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index 101bf19c0f411df4661d9046ed35be9bc11d9fb2..dc56ae3a68cdda5669cb7ed342f7e62a875e000c 100644 (file)
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1455,7 +1455,6 @@ union security_list_options {
        int (*kernel_act_as)(struct cred *new, u32 secid);
        int (*kernel_create_files_as)(struct cred *new, struct inode *inode);
        int (*kernel_module_request)(char *kmod_name);
-       int (*kernel_module_from_file)(struct file *file);
        int (*kernel_read_file)(struct file *file, enum kernel_read_file_id id);
        int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size,
                                     enum kernel_read_file_id id);

diff --git a/include/linux/security.h b/include/linux/security.h
index 7831cd57bcf7336b22562dabab398be369ef6598..4c7412943b8114632d41994497a2aae7f2638293 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -307,7 +307,6 @@ void security_transfer_creds(struct cred *new, const struct cred *old);
 int security_kernel_act_as(struct cred *new, u32 secid);
 int security_kernel_create_files_as(struct cred *new, struct inode *inode);
 int security_kernel_module_request(char *kmod_name);
-int security_kernel_module_from_file(struct file *file);
 int security_kernel_read_file(struct file *file, enum kernel_read_file_id id);
 int security_kernel_post_read_file(struct file *file, char *buf, loff_t size,
                                   enum kernel_read_file_id id);