diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-04 10:07:59 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-10 15:19:57 +0100 |
| commit | cc2ef9b0f6371837faa5e430c0b6c48bf24a8c4c (patch) | |
| tree | c23c36aa8a0324d291ae078e97df21d5bc359cad /meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch | |
| parent | 2c01ce4341b6745e2a778505d4840b64eb053e74 (diff) | |
| download | openembedded-core-contrib-cc2ef9b0f6371837faa5e430c0b6c48bf24a8c4c.tar.gz | |
lttng-modules: fix compilation for 3.17-rcX
Updating the lttng-modules 2.5 recipe with backports from the master branch to
enable builds on 3.17 based kernels.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch new file mode 100644 index 0000000000..3541b50b79 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch @@ -0,0 +1,46 @@ +Upstream-Status: Backport +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> + +From 458c2022e992c057bd21d02e4c77bcc7d4d6cd6c Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Date: Thu, 21 Aug 2014 11:15:50 -0400 +Subject: [PATCH 3/3] Update kvm instrumentation: compile on 3.17-rc1 + +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + instrumentation/events/lttng-module/arch/x86/kvm/trace.h | 12 +++++++++++- + 1 file changed, 11 insertions(+), 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 2354884074eb..3c299c58a1cf 100644 +--- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h ++++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +@@ -724,7 +724,7 @@ TRACE_EVENT(kvm_emulate_insn, + tp_memcpy(insn, + vcpu->arch.emulate_ctxt.decode.fetch.data, + 15) +-#else ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) + tp_assign(rip, vcpu->arch.emulate_ctxt.fetch.start) + tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) + tp_assign(len, vcpu->arch.emulate_ctxt._eip +@@ -732,6 +732,16 @@ TRACE_EVENT(kvm_emulate_insn, + tp_memcpy(insn, + vcpu->arch.emulate_ctxt.fetch.data, + 15) ++#else ++ tp_assign(rip, vcpu->arch.emulate_ctxt._eip - ++ (vcpu->arch.emulate_ctxt.fetch.ptr - ++ vcpu->arch.emulate_ctxt.fetch.data)) ++ tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) ++ tp_assign(len, vcpu->arch.emulate_ctxt.fetch.ptr - ++ vcpu->arch.emulate_ctxt.fetch.data) ++ tp_memcpy(insn, ++ vcpu->arch.emulate_ctxt.fetch.data, ++ 15) + #endif + tp_assign(flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode)) + tp_assign(failed, failed) +-- +1.8.1.2 + |