Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 659bdd079277ebdbec01f8a5c9dd38af1a19c888..099fc0f5155e6650b6fa451f56d3a7af061a736e 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -9,6 +9,7 @@ config OPROFILE
        tristate "OProfile system profiling"
        depends on PROFILING
        depends on HAVE_OPROFILE
+       depends on !PREEMPT_RT_FULL
        select RING_BUFFER
        select RING_BUFFER_ALLOW_SWAP
        help
@@ -52,6 +53,7 @@ config KPROBES
 config JUMP_LABEL
        bool "Optimize very unlikely/likely branches"
        depends on HAVE_ARCH_JUMP_LABEL
+       depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
        help
          This option enables a transparent branch optimization that
         makes certain almost-always-true or almost-always-false branch