- up to 2.13.11

diff --git a/kernel-6.6.patch b/kernel-6.6.patch
deleted file mode 100644 (file)
index e9e375c..0000000
--- a/kernel-6.6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6be48c9f6a32cdcab9824aaad0c19f92222633c4 Mon Sep 17 00:00:00 2001
-From: Kienan Stewart <kstewart@efficios.com>
-Date: Tue, 26 Sep 2023 14:45:09 -0400
-Subject: [PATCH] fix: lttng-probe-kvm-x86-mmu build with linux 6.6
-
-A small change was made upstream in `spte.h` that requires
-`arch/x86/kvm` to be added to the search path when
-building lttng-probe-kvm.x86-mmu.o.
-
-See upstream commit :
-
-  commit d10f3780bc2f80744d291e118c0c8bade54ed3b8
-  Author: Sean Christopherson <seanjc@google.com>
-  Date:   Tue Aug 8 15:40:59 2023 -0700
-
-      KVM: x86/mmu: Include mmu.h in spte.h
-
-      Explicitly include mmu.h in spte.h instead of relying on the "parent" to
-      include mmu.h.  spte.h references a variety of macros and variables that
-      are defined/declared in mmu.h, and so including spte.h before (or instead
-      of) mmu.h will result in build errors, e.g.
-
-Signed-off-by: Kienan Stewart <kstewart@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Change-Id: I5c3fc87d3b006cefbcca198e6e15868a342cb8dd
----
- src/probes/Kbuild | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/probes/Kbuild b/src/probes/Kbuild
-index eb0de4a8..73a15844 100644
---- a/src/probes/Kbuild
-+++ b/src/probes/Kbuild
-@@ -63,7 +63,8 @@ ifneq ($(CONFIG_KVM),)
-           ifeq ($(kvm_dep_emulate_check),ok)
-             CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm \
-                        -I$(srctree)/arch/x86/kvm
--            CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm
-+            CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm \
-+                       -I$(srctree)/arch/x86/kvm
-             obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86.o
-             obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86-mmu.o
-           else # ($(kvm_dep_emulate_check),ok)

diff --git a/lttng-modules.spec b/lttng-modules.spec
index bdd562a2daee7ca689d3aac5cf9cdf74356ed91a..1d1f91caea781bc68ff9bf3ae7c97f8a0224af4d 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,4 +1,4 @@
-#
+
 # Conditional build:
 %bcond_without kernelsrc       # probes which require full kernel source (kvm, btrfs, ext4, regmap)
 %bcond_with    verbose         # verbose build (V=1)
@@ -11,14 +11,13 @@
 Summary:       LTTng 2.x kernel modules
 Summary(pl.UTF-8):     Moduły jądra LTTng 2.x
 Name:          %{pname}%{_alt_kernel}
-Version:       2.13.10
+Version:       2.13.11
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5: eda323bb51c8fd414d30b7d6382d21a7
+# Source0-md5: 306dc7994fd020e7a21e0c64d42ee95c
 Patch0:                build.patch
-Patch1:                kernel-6.6.patch
 URL:           https://lttng.org/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.0}
 %{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:3.0}}
@@ -95,7 +94,6 @@ p=`pwd`\
 %setup -qc -n %{name}-%{version}
 cd %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 cd  %{pname}-%{version}