diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-26 18:35:51 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-26 18:35:51 +0200 |
| commit | b4acb0b697c678bba8262082b9274d11c341ed90 (patch) | |
| tree | 0ec0c2ac567cffc4692f77e144fbb3f632259a27 | |
| parent | 7f072a34719f7064189fd40d41f1b98d6bdbf653 (diff) | |
| download | lwn-b4acb0b697c678bba8262082b9274d11c341ed90.tar.gz lwn-b4acb0b697c678bba8262082b9274d11c341ed90.zip | |
markers: Disable markers on RT
No real users and the example code triggers an RCU code path which I'm
too lazy to fix simply because markers should go away anyway and Paul
is replacing that code by preemptibel tree rcu soon.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kvm/Kconfig | 2 | ||||
| -rw-r--r-- | init/Kconfig | 1 | ||||
| -rw-r--r-- | kernel/trace/Kconfig | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 8600a09e0c6c..2d89b40d689d 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -65,7 +65,7 @@ config KVM_AMD config KVM_TRACE bool "KVM trace support" - depends on KVM && SYSFS + depends on KVM && SYSFS && !PREEMPTRT select MARKERS select RELAY select DEBUG_FS diff --git a/init/Kconfig b/init/Kconfig index 71ac0ea0679b..ef7c8dbb2127 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1075,6 +1075,7 @@ config TRACEPOINTS config MARKERS bool "Activate markers" + depends on !PREEMPT_RT select TRACEPOINTS help Place an empty function call at each marker site. Can be diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 86947452df6d..49f695a4e743 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -60,7 +60,6 @@ config EVENT_TRACING bool config CONTEXT_SWITCH_TRACER - select MARKERS bool # All tracer options should select GENERIC_TRACER. For those options that are |