summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-kernel
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2023-12-06 01:48:56 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-12-06 18:21:06 +0300
commitda295319aa739dfa657fb4a1ba7e81804ba48658 (patch)
treed8bb670855f82ac4f2a50e8ca78b4534c0865485 /poky/meta/recipes-kernel
parent4e5690417ceb3d4e031bf3fcd306f724026f9d3d (diff)
downloadopenbmc-da295319aa739dfa657fb4a1ba7e81804ba48658.tar.xz
subtree updates
meta-arm: 1dff3300fb..0b61cc659a: Ross Burton (1): meta-arm/selftest: add test that PAC/BTI instructions are used meta-openembedded: 991e6852a5..5ad7203f68: Alexander Kanavin (1): fio: revert "fio: upgrade 3.32 -> 2022" BELOUARGA Mohamed (1): monocypher: add crypto library recipe Dylan Turner (1): apache2: v2.4.57 to v2.4.58 to fix CVE-2023-43622 Hongxu Jia (1): freeradius: make sub packages to runtime depends on freeradius Kai Kang (1): libnma: remove conflict xml file Khem Raj (12): nlohmann-json: Fix SRCREV_FORMAT and do not package git metadata into ptests ptest-packagelists-meta-oe.inc: Move poco to slow tests sdbus-c++-libsystemd: Upgrade to 254 sdbus-c++-tools: Upgrade to 1.4.0 gstd: Fix systemd user unit packaging basu: Update to latest master sdbus-c++: Install ptests into PTEST_PATH liblognorm:Add asprintf to autoconf function check macro gnome-console,gnome-terminal: Depend on vte from core layer Revert "gnome-terminal: Remove recommendation on vte-prompt" vte9: Drop recipe basu: Update the SRCREV to get lld fix Luca Fancellu (1): linuxptp: Update downstream patches Markus Volk (9): libcacard: fix version string in libcacard.pc cups-filters: fix Makefile race condition system-config-printer: Add packageconfig for polkit pipewire: upgrade 0.3.85 > 1.0.0 libcacard: set meson version based on PV spice: Set meson version based on PV spice-gtk: Set meson version based on PV libdecor: update 0.2.0 -> 0.2.1 xdg-desktop-portal-gnome: upgrade 45.0 -> 45.1 Naveen Saini (2): tbb: upgrade 2021.9.0 -> 2021.11.0 tbb: enable NUMA/Hybrid CPU support Patrick Wicki (6): squid: update from v5.7 to v6.5 squid: add nm dispatcher reload hook squid: add auth packageconfig squid: move configs to sub package squid: add url-rewrite-helpers packageconfig squid: add systemd service Patrick Williams (1): glog: Disable 64bit atomics on armv{5,6} Peter Kjellerstedt (1): redis: Inherit pkgconfig Ross Burton (1): python3-validators: add new recipe Wang Mingyu (26): ctags: upgrade 6.0.20231119.0 -> 6.0.20231126.0 dnfdragora: upgrade 2.1.4 -> 2.1.5 gensio: upgrade 2.7.7 -> 2.8.0 frr: upgrade 9.0.1 -> 9.1 capnproto: upgrade 1.0.1 -> 1.0.1.1 libbpf: upgrade 1.2.2 -> 1.3.0 paho-mqtt-cpp: upgrade 1.2.0 -> 1.3.1 tomoyo-tools: upgrade 2.5.0 -> 2.6.1 python3-aiohttp: upgrade 3.9.0 -> 3.9.1 python3-bitstring: upgrade 4.1.2 -> 4.1.3 python3-dbus-fast: upgrade 2.14.0 -> 2.15.0 python3-humanize: upgrade 4.8.0 -> 4.9.0 python3-ipython: upgrade 8.17.2 -> 8.18.0 python3-mypy: upgrade 1.7.0 -> 1.7.1 python3-pdm: upgrade 2.10.3 -> 2.10.4 python3-pexpect: upgrade 4.8.0 -> 4.9.0 python3-pychromecast: upgrade 13.0.7 -> 13.0.8 python3-pydantic: upgrade 2.5.1 -> 2.5.2 python3-pymisp: upgrade 2.4.178 -> 2.4.179 python3-pytest-xdist: upgrade 3.4.0 -> 3.5.0 python3-sentry-sdk: upgrade 1.35.0 -> 1.37.1 python3-types-setuptools: upgrade 68.2.0.1 -> 68.2.0.2 python3-virtualenv: upgrade 20.24.6 -> 20.24.7 redis: upgrade 7.2.2 -> 7.2.3 ser2net: upgrade 4.5.1 -> 4.6.0 thingsboard-gateway: upgrade 3.4.2 -> 3.4.3.1 alperak (12): squashfs-tools-ng: upgrade 1.1.4 -> 1.2.0 tmate: Fix finding msgpack 6+ msgpack-c: upgrade 4.0.0 -> 6.0.0 msgpack-cpp: upgrade 4.1.1 -> 6.1.0 brotli: upgrade 1.0.9 -> 1.1.0 icewm: upgrade 2.9.9 -> 3.4.4 iotop: upgrade 1.21 -> 1.25 liblognorm: upgrade 1.0.1 -> 2.0.6 libmodbus: upgrade 3.1.7 -> 3.1.10 libpwquality: upgrade 1.4.4 -> 1.4.5 libspiro: upgrade 20200505 -> 20221101 gtkwave: upgrade 3.3.111 -> 3.3.117 poky: 2696bf8cf3..028b6f6226: Adrian Freihofer (1): cmake-qemu.bbclass: support qemu for cmake Alassane Yattara (9): bitbake: toaster/tests: Update methods wait_until_~ to skip using time.sleep bitbake: toaster/tests: Override table edit columns TestCase from image recipe page bitbake: toaster/tests: Test software recipe page bitbake: toaster/tests: Added Machine page TestCase bitbake: toaster/tests: Added Layers page TestCase bitbake: toaster/tests: Added distro page TestCase bitbake: toaster/tests: Bug-fix on tests/functional/test_project_page bitbake: toaster/tests: Test single layer page bitbake: toaster/tests: Test single recipe page Alex Kiernan (4): rust: Delete python2 configparser code path rust: Drop TARGET_VENDOR export eudev: Upgrade 3.2.12 -> 3.2.14 rust: Drop targets and hosts override magic Alexander Kanavin (15): python3-pyproject-hooks: fix upstream version check cmake: upgrade 3.27.5 -> 3.27.7 desktop-file-utils: upgrade 0.26 -> 0.27 erofs-utils: upgrade 1.6 -> 1.7.1 webkitgtk: update 2.40.5 -> 2.42.2 epiphany: upgrade 44.6 -> 45.1 virglrenderer: upgrade 0.10.4 -> 1.0.0 libxkbcommon: upgrade 1.5.0 -> 1.6.0 mpg123: upgrade 1.31.3 -> 1.32.3 icu: upgrade 73-2 -> 74-1 p11-kit: upgrade 0.25.0 -> 0.25.2 glib-2.0: install gio-querymodules into bindir as well as libexecdir for native meson: update 1.2.2 -> 1.3.0 repo: update 2.37 -> 2.39 rt-tests: update 2.5 -> 2.6 Bruce Ashfield (1): lttng-modules: fix build for v6.7+ Changhyeok Bae (1): iptables: upgrade 1.8.9 -> 1.8.10 Charlie Johnston (2): bitbake.conf: Add gsutil as hosttool for gcp fetcher. bitbake: fetch2: Ensure GCP fetcher checks if file exists before download. Jan Vermaete (1): systemd: fixed typo Joao Marcos Costa (1): documentation.conf: fix do_menuconfig description Joshua Watt (2): bitbake: bitbake-hashclient: Add commands to get hashes bitbake: hashserv: sqlite: Ensure sync propagates to database connections Julien Stephan (6): devtool: fix update-recipe dry-run mode lib/oe/recipeutils.py: remove trailing white-spaces devtool: finish/update-recipe: restrict mode srcrev to recipes fetched from SCM devtool: tag all submodules devtool: add support for git submodules oeqa/selftest/devtool: add test for git submodules Justin Bronder (1): contributor-guide: add License-Update tag Kareem Zarka (2): wic: bootimg-efi: Make kernel image installation configurable oeqa/selftest/wic: Add tests for kernel image installation Khem Raj (8): shared-mime-info: Fix build with clang-17+ libsoup-2.4: Fix build with clang-17 and libxml2-2.12 busybox: Enable utmp support on musl systems virglrenderer: Fix build with clang llvm: Upgrade to 17.0.6 rust-common.bbclass: Define rust arch for x32 platforms vte: Upgrade to 0.74.1 vte: Separate out gtk4 pieces of vte into individual packages Lee Chee Yang (3): wic: add test for partition hidden attributes migration-guides: add release notes for 4.3.1 openssl: upgrade to 3.2.0 Malte Schmidt (1): wic: rawcopy: add support for zstd decompression Marco Felsch (1): json-c: fix icecc compilation Markus Volk (3): bluez5: fix connection for ps5/dualshock controllers cups: Add root,sys,wheel to system groups vte: upgrade 0.72.2 -> 0.74.0 Martin Hundeb?ll (1): libpam: split /etc/environment into pam-plugin-env package Matsunaga-Shinji (1): cve-check: Modify judgment processing using "=" in version comparison Michael Opdenacker (4): systemd-compat-units.bb: fix postinstall script dev-manual: layers: update link to YP Compatible form contributor-guide: fix command option migration-guides: release 3.5 is actually 4.0 Niko Mauno (1): rust-llvm: Allow overriding LLVM target archs Patrick Williams (1): shared-mime-info-native: handle old GCC for AlmaLinux8 Peter Marko (2): cve-update-nvd2-native: remove unused variable CVE_SOCKET_TIMEOUT cve-update-nvd2-native: make number of fetch attemtps configurable Richard Haar (1): bitbake: bitbake: tests: Fix duplicate test_underscore_override test Richard Purdie (2): bitbake: ui/ncurses: Add missing function call to avoid traceback bitbake: cooker: Avoid eventlog variable listing lockups Robert Yang (2): gnu-config: Update to latest revision gettext: Upgrade 0.22 -> 0.22.3 Ross Burton (3): core-image-minimal-initramfs: don't install a kernel into the initramfs autoconf: upgrade to 2.72d Revert "cve-check: Modify judgment processing using "=" in version comparison" Sundeep KOKKONDA (3): rust: Split rustdoc into a separate package glibc: stable 2.38 branch updates binutils: stable 2.41 branch updates Tim Orling (8): python3-sphinxcontrib-applehelp: 1.0.4 -> 1.0.7 python3-sphinxcontrib-devhelp: 1.0.2 -> 1.0.5 python3-sphinxcontrib-htmlhelp: 2.0.1 -> 2.0.4 python3-sphinxcontrib-qthelp: 1.0.3 -> 1.0.6 python3-sphinxcontrib-serializinghtml: 1.1.5 -> 1.1.9 vim: upgrade 9.0.2068 -> 9.0.2130 python3-cryptography-vectors: add RECIPE_NO_UPDATE_REASON python3-cryptography{-vectors}: 41.0.5 -> 41.0.7 Trevor Gamblin (2): python3-ptest: skip test_storlines patchtest: shorten patch signed-off-by test output Viswanath Kraleti (1): systemd-boot: Fix build issues on armv7a-linux Wang Mingyu (27): bind: upgrade 9.18.19 -> 9.18.20 diffoscope: upgrade 251 -> 252 ell: upgrade 0.59 -> 0.60 git: upgrade 2.42.1 -> 2.43.0 gnutls: upgrade 3.8.1 -> 3.8.2 libdrm: upgrade 2.4.117 -> 2.4.118 libgcrypt: upgrade 1.10.2 -> 1.10.3 libksba: upgrade 1.6.4 -> 1.6.5 libxslt: upgrade 1.1.38 -> 1.1.39 log4cplus: upgrade 2.1.0 -> 2.1.1 python3-certifi: upgrade 2023.7.22 -> 2023.11.17 python3-setuptools: upgrade 68.2.2 -> 69.0.2 python3-wcwidth: upgrade 0.2.9 -> 0.2.11 python3-hypothesis: upgrade 6.89.0 -> 6.90.0 python3-pyasn1: upgrade 0.5.0 -> 0.5.1 python3-scons: upgrade 4.5.2 -> 4.6.0 python3-urllib3: upgrade 2.0.7 -> 2.1.0 ethtool: upgrade 6.5 -> 6.6 gi-docgen: upgrade 2023.1 -> 2023.3 init-system-helpers: upgrade 1.65.2 -> 1.66 libsolv: upgrade 0.7.26 -> 0.7.27 python3-idna: upgrade 3.4 -> 3.6 ofono: upgrade 2.1 -> 2.2 python3-sphinx-rtd-theme: upgrade 1.3.0 -> 2.0.0 python3-trove-classifiers: upgrade 2023.11.14 -> 2023.11.22 python3-wheel: upgrade 0.41.3 -> 0.42.0 resolvconf: upgrade 1.91 -> 1.92 Xiangyu Chen (2): shadow: Fix for CVE-2023-4641 bash: changes to SIGINT handler while waiting for a child Zahir Hussain (1): cmake: Unset CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES meta-raspberrypi: 8231f97534..fde68b24f0: Lorenzo Arena (1): docs: fix syntax for overriding fs type for initramfs image Change-Id: Idc6f6b1e913442bae03dfec9f207924c56f31056 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'poky/meta/recipes-kernel')
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-phys_proc_id-and-cpu_core_id-moved-in-linux-6.7..patch79
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch10
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch35
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-modules/0002-fix-mm-vmscan-signatures-changed-in-linux-6.7.0-rc1.patch71
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-modules_2.13.10.bb3
5 files changed, 193 insertions, 5 deletions
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-phys_proc_id-and-cpu_core_id-moved-in-linux-6.7..patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-phys_proc_id-and-cpu_core_id-moved-in-linux-6.7..patch
new file mode 100644
index 0000000000..598f5a7efa
--- /dev/null
+++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-phys_proc_id-and-cpu_core_id-moved-in-linux-6.7..patch
@@ -0,0 +1,79 @@
+From 4f32efe70b618c4721bf197692fc9d709d352528 Mon Sep 17 00:00:00 2001
+From: Kienan Stewart <kstewart@efficios.com>
+Date: Mon, 20 Nov 2023 11:27:12 -0500
+Subject: [PATCH 1/2] fix: phys_proc_id and cpu_core_id moved in linux
+ 6.7.0-rc1
+
+See upstream commit:
+
+ commit 02fb601d27a7abf60d52b21bdf5b100a8d63da3f
+ Author: Thomas Gleixner <tglx@linutronix.de>
+ Date: Mon Aug 14 10:18:30 2023 +0200
+
+ x86/cpu: Move phys_proc_id into topology info
+
+ Rename it to pkg_id which is the terminology used in the kernel.
+
+ No functional change.
+
+See upstream commit:
+
+ commit e95256335d45cc965cd12c423535002974313340
+ Author: Thomas Gleixner <tglx@linutronix.de>
+ Date: Mon Aug 14 10:18:34 2023 +0200
+
+ x86/cpu: Move cpu_core_id into topology info
+
+ Rename it to core_id and stick it to the other ID fields.
+
+ No functional change.
+
+Upstream-Status: Backport [commit 4f32efe7]
+
+Signed-off-by: Kienan Stewart <kstewart@efficios.com>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+Change-Id: I574b02430210d5bb72c4b9db901d0e3a6dc7bea0
+---
+ .../instrumentation/events/lttng-statedump.h | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/include/instrumentation/events/lttng-statedump.h b/include/instrumentation/events/lttng-statedump.h
+index 642aa356..4831a941 100644
+--- a/include/instrumentation/events/lttng-statedump.h
++++ b/include/instrumentation/events/lttng-statedump.h
+@@ -253,6 +253,23 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_interrupt,
+
+ #define LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+
++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0))
++LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
++ TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
++ TP_ARGS(session, c),
++ TP_FIELDS(
++ ctf_string(architecture, "x86")
++ ctf_integer(uint16_t, cpu_id, c->cpu_index)
++ ctf_string(vendor, c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown")
++ ctf_integer(uint8_t, family, c->x86)
++ ctf_integer(uint8_t, model, c->x86_model)
++ ctf_string(model_name, c->x86_model_id[0] ? c->x86_model_id : "unknown")
++ ctf_integer(uint16_t, physical_id, c->topo.pkg_id)
++ ctf_integer(uint16_t, core_id, c->topo.core_id)
++ ctf_integer(uint16_t, cores, c->booted_cores)
++ )
++)
++#else
+ LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
+ TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
+ TP_ARGS(session, c),
+@@ -268,6 +285,8 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
+ ctf_integer(uint16_t, cores, c->booted_cores)
+ )
+ )
++#endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) */
++
+ #endif /* CONFIG_X86_32 || CONFIG_X86_64 */
+
+ #endif /* LTTNG_TRACE_LTTNG_STATEDUMP_H */
+--
+2.34.1
+
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
index 76a5787c37..120528bf9c 100644
--- a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
+++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
@@ -19,10 +19,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
src/Kbuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/src/Kbuild b/src/Kbuild
-index 7137874..04eb5c9 100644
---- a/src/Kbuild
-+++ b/src/Kbuild
+Index: lttng-modules-2.13.10/src/Kbuild
+===================================================================
+--- lttng-modules-2.13.10.orig/src/Kbuild
++++ lttng-modules-2.13.10/src/Kbuild
@@ -2,10 +2,13 @@
ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
@@ -38,7 +38,7 @@ index 7137874..04eb5c9 100644
TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
lttng_check_linux_version = $(shell pwd)/include/linux/version.h
-@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-impl.o
+@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-
obj-$(CONFIG_LTTNG) += probes/
obj-$(CONFIG_LTTNG) += lib/
obj-$(CONFIG_LTTNG) += tests/
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch
new file mode 100644
index 0000000000..b374483517
--- /dev/null
+++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch
@@ -0,0 +1,35 @@
+From 76e4ea0c33a8c7726c0df28083d5c8bc1c1335e8 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Thu, 23 Nov 2023 13:49:51 -0500
+Subject: [PATCH] wrapper/fdtable: adjust fd lookup to v6.7+
+
+commit 0ede61d8589cc2d93 [file: convert to SLAB_TYPESAFE_BY_RCU]
+renames lookup_fd_rcu to lookup_fdget_rcu, so we need to
+version adjust the fdtable wrapper accordingly.
+
+Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2023-November/030667.html]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ include/wrapper/fdtable.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/wrapper/fdtable.h b/include/wrapper/fdtable.h
+index fa5f7207..aaf2b9e7 100644
+--- a/include/wrapper/fdtable.h
++++ b/include/wrapper/fdtable.h
+@@ -16,7 +16,11 @@
+ static inline
+ struct file *lttng_lookup_fd_rcu(unsigned int fd)
+ {
++#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(6,7,0))
+ return lookup_fd_rcu(fd);
++#else
++ return lookup_fdget_rcu(fd);
++#endif
+ }
+ #else
+ static inline
+--
+2.34.1
+
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0002-fix-mm-vmscan-signatures-changed-in-linux-6.7.0-rc1.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0002-fix-mm-vmscan-signatures-changed-in-linux-6.7.0-rc1.patch
new file mode 100644
index 0000000000..a1b979c95a
--- /dev/null
+++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0002-fix-mm-vmscan-signatures-changed-in-linux-6.7.0-rc1.patch
@@ -0,0 +1,71 @@
+From aee34d916bdae79abcf103ef098cbb2e0c20bf83 Mon Sep 17 00:00:00 2001
+From: Kienan Stewart <kstewart@efficios.com>
+Date: Mon, 20 Nov 2023 11:33:14 -0500
+Subject: [PATCH 2/2] fix: mm, vmscan signatures changed in linux 6.7.0-rc1
+
+See upstream commit:
+
+ commit 3dfbb555c98ac55b9d911f9af0e35014b445fb41
+ Author: Vlastimil Babka <vbabka@suse.cz>
+ Date: Thu Sep 14 15:16:39 2023 +0200
+
+ mm, vmscan: remove ISOLATE_UNMAPPED
+
+ This isolate_mode_t flag is effectively unused since 89f6c88a6ab4 ("mm:
+ __isolate_lru_page_prepare() in isolate_migratepages_block()") as
+ sc->may_unmap is now checked directly (and only node_reclaim has a mode
+ that sets it to 0). The last remaining place is mm_vmscan_lru_isolate
+ tracepoint for the isolate_mode parameter. That one was mainly used to
+ indicate the active/inactive mode, which the trace-vmscan-postprocess.pl
+ script consumed, but that got silently broken. After fixing the script by
+ the previous patch, it does not need the isolate_mode anymore. So just
+ remove the parameter and with that the whole ISOLATE_UNMAPPED flag.
+
+Upstream-Status: Backport [commit aee34d91]
+
+Signed-off-by: Kienan Stewart <kstewart@efficios.com>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+Change-Id: Ie7346886d926a1a9d20bcb1570c587c5e943a1c3
+---
+ include/instrumentation/events/mm_vmscan.h | 28 +++++++++++++++++++++-
+ 1 file changed, 27 insertions(+), 1 deletion(-)
+
+Index: lttng-modules-2.13.10/include/instrumentation/events/mm_vmscan.h
+===================================================================
+--- lttng-modules-2.13.10.orig/include/instrumentation/events/mm_vmscan.h
++++ lttng-modules-2.13.10/include/instrumentation/events/mm_vmscan.h
+@@ -369,7 +369,33 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_sla
+ )
+ #endif
+
+-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0))
++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0))
++LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
++
++ TP_PROTO(int classzone_idx,
++ int order,
++ unsigned long nr_requested,
++ unsigned long nr_scanned,
++ unsigned long nr_skipped,
++ unsigned long nr_taken,
++ int lru
++ ),
++
++ TP_ARGS(classzone_idx, order, nr_requested, nr_scanned, nr_skipped,
++ nr_taken, lru
++ ),
++
++ TP_FIELDS(
++ ctf_integer(int, classzone_idx, classzone_idx)
++ ctf_integer(int, order, order)
++ ctf_integer(unsigned long, nr_requested, nr_requested)
++ ctf_integer(unsigned long, nr_scanned, nr_scanned)
++ ctf_integer(unsigned long, nr_skipped, nr_skipped)
++ ctf_integer(unsigned long, nr_taken, nr_taken)
++ ctf_integer(int, lru, lru)
++ )
++)
++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0))
+ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
+
+ TP_PROTO(int classzone_idx,
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.10.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.10.bb
index 4c0e37ebc7..a7e3096c6a 100644
--- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.10.bb
+++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.10.bb
@@ -10,6 +10,9 @@ inherit module
include lttng-platforms.inc
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
+ file://0001-fix-phys_proc_id-and-cpu_core_id-moved-in-linux-6.7..patch \
+ file://0002-fix-mm-vmscan-signatures-changed-in-linux-6.7.0-rc1.patch \
+ file://0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch \
"
# Use :append here so that the patch is applied also when using devupstream