Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 11d349561ece37a33c7f43eeeeee97a16fe83b55..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
@@ -383,6 +385,24 @@ config GCC_PLUGIN_SANCOV
          gcc-4.5 on). It is based on the commit "Add fuzzing coverage support"
          by Dmitry Vyukov <dvyukov@google.com>.
 
+config GCC_PLUGIN_LATENT_ENTROPY
+       bool "Generate some entropy during boot and runtime"
+       depends on GCC_PLUGINS
+       help
+         By saying Y here the kernel will instrument some kernel code to
+         extract some entropy from both original and artificially created
+         program state.  This will help especially embedded systems where
+         there is little 'natural' source of entropy normally.  The cost
+         is some slowdown of the boot process (about 0.5%) and fork and
+         irq processing.
+
+         Note that entropy extracted this way is not cryptographically
+         secure!
+
+         This plugin was ported from grsecurity/PaX. More information at:
+          * https://grsecurity.net/
+          * https://pax.grsecurity.net/
+
 config HAVE_CC_STACKPROTECTOR
        bool
        help