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

[sfrench/cifs-2.6.git] / include / linux / compiler-gcc.h

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index c1a963be7d289e6edafba98f1d7d0236ee4f69f1..34ad8bb549a645a7e5682f3d84853e971272763f 100644 (file)
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -35,7 +35,7 @@
        (typeof(ptr)) (__ptr + (off));                                  \
 })
 
-#ifdef CONFIG_RETPOLINE
+#ifdef CONFIG_MITIGATION_RETPOLINE
 #define __noretpoline __attribute__((__indirect_branch__("keep")))
 #endif