From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 11 May 2011 15:05:23 +0000 (-0400)
Subject: Fix nohz support
X-Git-Tag: v2.0-pre1~161
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e4d878f6be12c2cba10aab1e41b24e8b603b200e;p=lttng-modules.git

Fix nohz support

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index 07ecc1d0..9ecabb0b 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -437,7 +437,7 @@ int __cpuinit lib_ring_buffer_cpu_hp_callback(struct notifier_block *nb,
 }
 #endif
 
-#ifdef CONFIG_NO_HZ
+#if defined(CONFIG_NO_HZ) && !defined(CONFIG_LIB_RING_BUFFER)
 /*
  * For per-cpu buffers, call the reader wakeups before switching the buffer, so
  * that wake-up-tracing generated events are flushed before going idle (in
@@ -517,7 +517,7 @@ void notrace lib_ring_buffer_tick_nohz_restart(void)
 	atomic_notifier_call_chain(&tick_nohz_notifier, TICK_NOHZ_RESTART,
 				   NULL);
 }
-#endif /* CONFIG_NO_HZ */
+#endif /* defined(CONFIG_NO_HZ) && !defined(CONFIG_LIB_RING_BUFFER) */
 
 /*
  * Holds CPU hotplug.