From: =?utf-8?q?Christian=20Borntr=C3=A4ger?= <christ...@borntraeger.net>
commit acb57be20f6b600848a99796d8f115ec079b8b08
Author: Marcelo Tosatti <mtosa...@redhat.com>
Date: Wed Jun 17 09:22:14 2009 -0300
KVM: convert custom marker based tracing to event traces
causes the following compile error on s390:
CC [M] arch/s390/kvm/../../../virt/kvm/kvm_main.o
In file included from include/trace/ftrace.h:261,
from include/trace/define_trace.h:56,
from include/trace/events/kvm.h:55,
from arch/s390/kvm/../../../virt/kvm/kvm_main.c:63:
include/trace/events/kvm.h: In function 'ftrace_raw_output_kvm_ack_irq':
include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_PIC_MASTER' undeclared
(first use in this function)
include/trace/events/kvm.h:31: error: (Each undeclared identifier is reported
only once
include/trace/events/kvm.h:31: error: for each function it appears in.)
include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_PIC_SLAVE' undeclared (first
use in this function)
include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_IOAPIC' undeclared (first
use in this function)
This patch protects the affected tracers with __KVM_HAVE_IOAPIC and
__KVM_HAVE_PIT.
CC: Marcelo Tosatti <mtosa...@redhat.com>
Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com>
Signed-off-by: Avi Kivity <a...@redhat.com>
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index d3d8574..dff68b3 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -3,6 +3,7 @@
#include <linux/tracepoint.h>
+#if defined(__KVM_HAVE_IOAPIC) && defined(__KVM_HAVE_PIT)
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm
#define TRACE_INCLUDE_FILE kvm
@@ -49,6 +50,7 @@ TRACE_EVENT(kvm_ack_irq,
+#endif /* defined(__KVM_HAVE_IOAPIC) && defined(__KVM_HAVE_PIT) */
#endif /* _TRACE_KVM_MAIN_H */
/* This part must be outside protection */
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
