From 3a3b740faf8e26a96a9a3e6eadab4b314a2e3356 Mon Sep 17 00:00:00 2001
From: Anders Wallin <wallinux@gmail.com>
Date: Fri, 22 Jul 2016 16:10:47 +0200
Subject: [PATCH] Fix: Add kernel configuration for lttng clock plugin

Only one lttng clock plugin can be used when building the lttng-modules
in the kernel. To make it possible to use a custom clock plugin it must
be possible to unconfigure the test clock plugin

Signed-off-by: Anders Wallin <wallinux@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 Kconfig       | 2 ++
 Makefile      | 6 +++---
 tests/Kbuild  | 2 +-
 tests/Kconfig | 8 ++++++++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 tests/Kconfig

diff --git a/Kconfig b/Kconfig
index 6b4ad683..c350b9b6 100644
--- a/Kconfig
+++ b/Kconfig
@@ -10,3 +10,5 @@ config LTTNG
 	  the Linux kernel image, choose Y.
 
 	  If unsure, say N.
+
+source "lttng/tests/Kconfig"
diff --git a/Makefile b/Makefile
index c2b12132..8602649a 100644
--- a/Makefile
+++ b/Makefile
@@ -107,15 +107,15 @@ CFLAGS = $(EXTCFLAGS)
 default: modules
 
 modules:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules
 
 modules_install:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules_install
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules_install
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 %.i: %.c
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m $@
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $@
 
 endif # KERNELRELEASE
diff --git a/tests/Kbuild b/tests/Kbuild
index 5e49007a..aabb8e20 100644
--- a/tests/Kbuild
+++ b/tests/Kbuild
@@ -7,7 +7,7 @@ ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
 obj-$(CONFIG_LTTNG) += lttng-test.o
 lttng-test-objs := probes/lttng-test.o
 
-obj-$(CONFIG_LTTNG) += lttng-clock-plugin-test.o
+obj-$(CONFIG_LTTNG_CLOCK_PLUGIN_TEST) += lttng-clock-plugin-test.o
 lttng-clock-plugin-test-objs := clock-plugin/lttng-clock-plugin-test.o
 
 # vim:syntax=make
diff --git a/tests/Kconfig b/tests/Kconfig
new file mode 100644
index 00000000..65e0a2b7
--- /dev/null
+++ b/tests/Kconfig
@@ -0,0 +1,8 @@
+config LTTNG_CLOCK_PLUGIN_TEST
+       tristate "Use test plugin as trace clock"
+       depends on LTTNG
+       help
+	 Use the test clock as trace clock. This plugin freezes the
+	 time with 1 KHz for regression test.
+	 It's recommended to build this as a module to work with the
+	 lttng-tools test suite.
-- 
2.34.1