diff options
author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2011-03-16 19:05:56 -0400 |
---|---|---|
committer | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2011-03-16 19:05:56 -0400 |
commit | 99bc73f616db2e87f0e1918aad59eb68ee1ff573 (patch) | |
tree | ff22b049b79f2079af957f514a659bd571198d69 | |
parent | 8c437a5aedd491a37f93334838abebe90f66e9ef (diff) |
Move KVM trace includes in a standard directory
The mmutrace.h and trace.h were defined in arch/x86/kvm/.
Moved them in arch/x86/include and fixed the dependencies to make
inclusion possible by lttng-modules.
From: Julien Desfossez <julien.desfossez@polymtl.ca>
Signed-off-by: Julien Desfossez <julien.desfossez@polymtl.ca>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-rw-r--r-- | arch/x86/include/asm/kvm-mmutrace.h (renamed from arch/x86/kvm/mmutrace.h) | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/kvm-trace.h (renamed from arch/x86/kvm/trace.h) | 4 | ||||
-rw-r--r-- | arch/x86/kvm/i8259.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/lapic.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/mmu.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/svm.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/vmx.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/include/asm/kvm-mmutrace.h index b60b4fdb3ed..42d117d0418 100644 --- a/arch/x86/kvm/mmutrace.h +++ b/arch/x86/include/asm/kvm-mmutrace.h @@ -217,9 +217,9 @@ TRACE_EVENT( #endif /* _TRACE_KVMMMU_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH asm #undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE mmutrace +#define TRACE_INCLUDE_FILE kvm-mmutrace /* This part must be outside protection */ #include <trace/define_trace.h> diff --git a/arch/x86/kvm/trace.h b/arch/x86/include/asm/kvm-trace.h index 1357d7cf4ec..c1e151c092b 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/include/asm/kvm-trace.h @@ -701,9 +701,9 @@ TRACE_EVENT(kvm_emulate_insn, #endif /* _TRACE_KVM_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH arch/x86/kvm +#define TRACE_INCLUDE_PATH asm #undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE trace +#define TRACE_INCLUDE_FILE kvm-trace /* This part must be outside protection */ #include <trace/define_trace.h> diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c index 3cece05e4ac..f894af174b8 100644 --- a/arch/x86/kvm/i8259.c +++ b/arch/x86/kvm/i8259.c @@ -32,7 +32,7 @@ #include "irq.h" #include <linux/kvm_host.h> -#include "trace.h" +#include <asm/kvm-trace.h> static void pic_irq_request(struct kvm *kvm, int level); diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 93cf9d0d365..58bcbce5b02 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -36,7 +36,7 @@ #include <asm/atomic.h> #include "kvm_cache_regs.h" #include "irq.h" -#include "trace.h" +#include <asm/kvm-trace.h> #include "x86.h" #ifndef CONFIG_X86_64 diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index f02b8edc3d4..3612044ed1f 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -163,7 +163,7 @@ module_param(oos_shadow, bool, 0644); #include <trace/events/kvm.h> #define CREATE_TRACE_POINTS -#include "mmutrace.h" +#include <asm/kvm-mmutrace.h> #define SPTE_HOST_WRITEABLE (1ULL << PT_FIRST_AVAIL_BITS_SHIFT) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 63fec1531e8..b14429dda24 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -34,7 +34,7 @@ #include <asm/kvm_para.h> #include <asm/virtext.h> -#include "trace.h" +#include <asm/kvm-trace.h> #define __ex(x) __kvm_handle_fault_on_reboot(x) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index bf89ec2cfb8..d12b42e234b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -40,7 +40,7 @@ #include <asm/i387.h> #include <asm/xcr.h> -#include "trace.h" +#include <asm/kvm-trace.h> #define __ex(x) __kvm_handle_fault_on_reboot(x) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bcc0efce85b..6a8cb6fe5c1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -47,7 +47,7 @@ #include <trace/events/kvm.h> #define CREATE_TRACE_POINTS -#include "trace.h" +#include <asm/kvm-trace.h> #include <asm/debugreg.h> #include <asm/msr.h> |