[packages/lttng-modules] - updated to 2.13.16

qboosh qboosh at pld-linux.org
Thu Nov 21 19:00:45 CET 2024


commit 3c5107dabd3b356af88a23b26be25d21ec4c00bf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Nov 21 18:38:27 2024 +0100

    - updated to 2.13.16

 kernel-5.15.171.patch | 54 ---------------------------------------------------
 lttng-modules.spec    |  8 +++-----
 2 files changed, 3 insertions(+), 59 deletions(-)
---
diff --git a/lttng-modules.spec b/lttng-modules.spec
index 45094f1..65370d2 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -6,19 +6,18 @@
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		rel	2
+%define		rel	1
 %define		pname	lttng-modules
 Summary:	LTTng 2.x kernel modules
 Summary(pl.UTF-8):	Moduły jądra LTTng 2.x
 Name:		%{pname}%{_alt_kernel}
-Version:	2.13.15
+Version:	2.13.16
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5:	61e4ac15e8e4e9d3625293cc92e7f0f2
+# Source0-md5:	be5353fb62d7679fff4e393f65002b3f
 Patch0:		build.patch
-Patch1:		kernel-5.15.171.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}
diff --git a/kernel-5.15.171.patch b/kernel-5.15.171.patch
deleted file mode 100644
index d459a5e..0000000
--- a/kernel-5.15.171.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 25401cbde2a2a560f20fdd87fc0562339e9da689 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson at efficios.com>
-Date: Tue, 12 Nov 2024 11:19:23 -0500
-Subject: [PATCH] fix: mm/page_alloc: fix tracepoint
- mm_page_alloc_zone_locked() (v5.15.171)
-
-See upstream backported commit:
-
-  commit 28e7a507196fefd119e7ca2286840f1a9aad5e8a
-  Author: Wonhyuk Yang <vvghjk1234 at gmail.com>
-  Date:   Thu May 19 14:08:54 2022 -0700
-
-    mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked()
-
-    [ Upstream commit 10e0f7530205799e7e971aba699a7cb3a47456de ]
-
-    Currently, trace point mm_page_alloc_zone_locked() doesn't show correct
-    information.
-
-    First, when alloc_flag has ALLOC_HARDER/ALLOC_CMA, page can be allocated
-    from MIGRATE_HIGHATOMIC/MIGRATE_CMA.  Nevertheless, tracepoint use
-    requested migration type not MIGRATE_HIGHATOMIC and MIGRATE_CMA.
-
-    Second, after commit 44042b4498728 ("mm/page_alloc: allow high-order pages
-    to be stored on the per-cpu lists") percpu-list can store high order
-    pages.  But trace point determine whether it is a refiil of percpu-list by
-    comparing requested order and 0.
-
-    To handle these problems, make mm_page_alloc_zone_locked() only be called
-    by __rmqueue_smallest with correct migration type.  With a new argument
-    called percpu_refill, it can show roughly whether it is a refill of
-    percpu-list.
-
-    Link: https://lkml.kernel.org/r/20220512025307.57924-1-vvghjk1234@gmail.com
-
-Change-Id: Ib76feb79d95e9f93c84c3aa1b946e57ac2e2666a
-Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
----
- include/instrumentation/events/kmem.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h
-index 3c616cb2..b761a67b 100644
---- a/include/instrumentation/events/kmem.h
-+++ b/include/instrumentation/events/kmem.h
-@@ -367,6 +367,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc,
- )
- 
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0) || \
-+	LTTNG_KERNEL_RANGE(5,15,171, 5,16,0) || \
- 	LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0))
- 
- LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/3c5107dabd3b356af88a23b26be25d21ec4c00bf



More information about the pld-cvs-commit mailing list