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 <todd.vierling@oracle.com>
Reviewed-by: Victor Erminpour <victor.erminpour@oracle.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0a456e2277e5c8db432784c9935c534b37b2dced..3290bbb4805bb188a4281f46c9b6e50c93ac974f 100644 (file)
--- 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