Merge 4.14.94 into android-4.14-p

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index a9d546c5b9aaa5ade0dca96ea74c44dfdf306da6..2d01e23c34a930fc9644064a614f1ddfb3c511b0 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -19,6 +19,7 @@
 #include <linux/jump_label.h>
 #include <linux/export.h>
 #include <linux/rbtree_latch.h>
+#include <linux/cfi.h>
 
 #include <linux/percpu.h>
 #include <asm/module.h>
@@ -346,6 +347,10 @@ struct module {
        const s32 *crcs;
        unsigned int num_syms;
 
+#ifdef CONFIG_CFI_CLANG
+       cfi_check_fn cfi_check;
+#endif
+
        /* Kernel parameters. */
 #ifdef CONFIG_SYSFS
        struct mutex param_lock;