[packages/lttng-modules] - fix building with kernel 5.5.3+ - rel 2
baggins
baggins at pld-linux.org
Sun Feb 23 08:02:29 CET 2020
commit d4618bf161eec8afc1ed1b3008cddeccc6c621c7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Feb 23 08:00:17 2020 +0100
- fix building with kernel 5.5.3+
- rel 2
kernel-5.5.3.patch | 32 ++++++++++++++++++++++++++++++++
lttng-modules.spec | 4 +++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/lttng-modules.spec b/lttng-modules.spec
index 5c31cf5..c634b14 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -7,7 +7,7 @@
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 1
+%define rel 2
%define pname lttng-modules
Summary: LTTng 2.x kernel modules
Summary(pl.UTF-8): Moduły jądra LTTng 2.x
@@ -19,6 +19,7 @@ Group: Base/Kernel
Source0: https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
# Source0-md5: 0d964723c8765b39835e5e6efc60a604
Patch0: build.patch
+Patch1: kernel-5.5.3.patch
URL: https://lttng.org/
%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38}
%{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:2.6.38}}
@@ -92,6 +93,7 @@ p=`pwd`\
%setup -qc
cd %{pname}-%{version}
%patch0 -p1
+%patch1 -p1
%build
cd %{pname}-%{version}
diff --git a/kernel-5.5.3.patch b/kernel-5.5.3.patch
new file mode 100644
index 0000000..eb17ab3
--- /dev/null
+++ b/kernel-5.5.3.patch
@@ -0,0 +1,32 @@
+--- lttng-modules-2.11.1/lttng-modules-2.11.1/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h~ 2020-01-28 16:09:46.000000000 +0100
++++ lttng-modules-2.11.1/lttng-modules-2.11.1/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h 2020-02-23 07:58:12.916686709 +0100
+@@ -219,6 +219,21 @@
+
+ kvm_mmu_fast_page_fault,
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,3))
++ TP_PROTO(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u32 error_code,
++ u64 *sptep, u64 old_spte, bool retry),
++ TP_ARGS(vcpu, cr2_or_gpa, error_code, sptep, old_spte, retry),
++
++ TP_FIELDS(
++ ctf_integer(int, vcpu_id, vcpu->vcpu_id)
++ ctf_integer(gpa_t, cr2_or_gpa, cr2_or_gpa)
++ ctf_integer(u32, error_code, error_code)
++ ctf_integer_hex(u64 *, sptep, sptep)
++ ctf_integer(u64, old_spte, old_spte)
++ ctf_integer(u64, new_spte, *sptep)
++ ctf_integer(bool, retry, retry)
++ )
++#else
+ TP_PROTO(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,
+ u64 *sptep, u64 old_spte, bool retry),
+ TP_ARGS(vcpu, gva, error_code, sptep, old_spte, retry),
+@@ -232,6 +247,7 @@
+ ctf_integer(u64, new_spte, *sptep)
+ ctf_integer(bool, retry, retry)
+ )
++#endif
+ )
+ #endif /* LTTNG_TRACE_KVM_MMU_H */
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/d4618bf161eec8afc1ed1b3008cddeccc6c621c7
More information about the pld-cvs-commit
mailing list