Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Apr 2026 18:10:17 +0000
From:      Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron <dumbbell@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: e692f36a678d - main - linuxkpi: Add `struct kmsg_dump_detail`
Message-ID:  <69e90f09.44d2f.3d440679@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by dumbbell:

URL: https://cgit.FreeBSD.org/src/commit/?id=e692f36a678d4fad6054161e554eb5ec544fffa8

commit e692f36a678d4fad6054161e554eb5ec544fffa8
Author:     Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
AuthorDate: 2026-04-11 09:28:01 +0000
Commit:     Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
CommitDate: 2026-04-22 18:09:50 +0000

    linuxkpi: Add `struct kmsg_dump_detail`
    
    This structure is used in a modified definition of `struct kmsg_dumper`
    field `dump` in Linux 6.12. Therefore this field has two definitions put
    behind the values of `LINUXKPI_VERSION`.
    
    The DRM generic code started to use it in Linux 6.12.
    
    Reviewed by:    bz
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D56433
---
 sys/compat/linuxkpi/common/include/linux/kmsg_dump.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sys/compat/linuxkpi/common/include/linux/kmsg_dump.h b/sys/compat/linuxkpi/common/include/linux/kmsg_dump.h
index 539981c54d1b..e7f95ced3047 100644
--- a/sys/compat/linuxkpi/common/include/linux/kmsg_dump.h
+++ b/sys/compat/linuxkpi/common/include/linux/kmsg_dump.h
@@ -30,9 +30,18 @@ struct kmsg_dump_iter {
 	uint64_t	next_seq;
 };
 
+struct kmsg_dump_detail {
+	enum kmsg_dump_reason reason;
+	const char *description;
+};
+
 struct kmsg_dumper {
 	struct list_head list;
+#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION < 61200
 	void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason);
+#else
+	void (*dump)(struct kmsg_dumper *dumper, struct kmsg_dump_detail *detail);
+#endif
 	enum kmsg_dump_reason max_reason;
 	bool registered;
 };


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e90f09.44d2f.3d440679>