From a8ee7aeca25819864e4742244ef5979165e4fc47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Biancheri?= Date: Tue, 14 Jul 2015 11:22:34 -0400 Subject: [PATCH] Fix: Rename kvm TRACE_SYSTEM to avoid name clash The lttng-probe-kvm and lttng-probe-kvm-x86 had the same TRACE_SYSTEM string. Because of that, both modules can't be loaded at the same time. The second module fails to load silently. This patch rename the TRACE_SYSTEM of lttng-probe-kvm-x86 to avoid the clash. Signed-off-by: Francis Giraldeau --- instrumentation/events/lttng-module/arch/x86/kvm/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h index 32c4743..ddbfda7 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h @@ -12,7 +12,7 @@ #include <../arch/x86/kvm/kvm_cache_regs.h> #undef TRACE_SYSTEM -#define TRACE_SYSTEM kvm +#define TRACE_SYSTEM kvm_x86 /* * Tracepoint for guest mode entry. -- 1.9.1