Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent...

[linux-2.6-microblaze.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index 96bc462..1153b0d 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -885,7 +885,7 @@ static inline void module_bug_finalize(const Elf_Ehdr *hdr,
 static inline void module_bug_cleanup(struct module *mod) {}
 #endif /* CONFIG_GENERIC_BUG */
 
-#ifdef CONFIG_RETPOLINE
+#ifdef CONFIG_MITIGATION_RETPOLINE
 extern bool retpoline_module_ok(bool has_retpoline);
 #else
 static inline bool retpoline_module_ok(bool has_retpoline)