From: Todd Vierling Date: Tue, 13 Feb 2018 15:26:57 +0000 (-0500) Subject: x86: make HAVE_FENTRY dependent on !SIMULATE_GCC44_KABI X-Git-Tag: v4.1.12-124.31.3~1134 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=889fcce7521993b403a02e200c42f89c0f6a10c8;p=users%2Fjedix%2Flinux-maple.git x86: make HAVE_FENTRY dependent on !SIMULATE_GCC44_KABI Something about the uek-rpm build doesn't always bubble config lines down into the built RPMs properly. So force the issue by making use of the special kABI flag introduced for OL6; if _not_ present, set HAVE_FENTRY in its original place in arch/x86/Kconfig. Orabug: 27540463 Signed-off-by: Todd Vierling Reviewed-by: Victor Erminpour --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0a456e2277e5..3290bbb4805b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -59,6 +59,7 @@ config X86 select HAVE_OPTPROBES select HAVE_KPROBES_ON_FTRACE select HAVE_FTRACE_MCOUNT_RECORD + select HAVE_FENTRY if X86_64 && !SIMULATE_GCC44_KABI select HAVE_C_RECORDMCOUNT select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE_WITH_REGS