diff mbox series

[1/1] package/emlog: Fix build on Linux 6.4

Message ID 20230708111431.425846-1-bernd@kuhls.net
State Accepted
Headers show
Series [1/1] package/emlog: Fix build on Linux 6.4 | expand

Commit Message

Bernd Kuhls July 8, 2023, 11:14 a.m. UTC 
Fixes:
http://autobuild.buildroot.net/results/f6c/f6c52f58c3c016cee59d2dfe513c449d96dc3b09/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../emlog/0001-Fix-build-on-Linux-6.4.patch   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/emlog/0001-Fix-build-on-Linux-6.4.patch

Comments

Thomas Petazzoni July 10, 2023, 4:39 p.m. UTC | #1 
On Sat,  8 Jul 2023 13:14:31 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Fixes:
> http://autobuild.buildroot.net/results/f6c/f6c52f58c3c016cee59d2dfe513c449d96dc3b09/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .../emlog/0001-Fix-build-on-Linux-6.4.patch   | 34 +++++++++++++++++++
>  1 file changed, 34 insertions(+)
>  create mode 100644 package/emlog/0001-Fix-build-on-Linux-6.4.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/emlog/0001-Fix-build-on-Linux-6.4.patch b/package/emlog/0001-Fix-build-on-Linux-6.4.patch
new file mode 100644
index 0000000000..65440c1933
--- /dev/null
+++ b/package/emlog/0001-Fix-build-on-Linux-6.4.patch
@@ -0,0 +1,34 @@ 
+From 32ec7f7b4eb1466100d59aaea8855d770af54327 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Sat, 8 Jul 2023 13:10:24 +0200
+Subject: [PATCH] Fix build on Linux 6.4
+
+Needed after upstream changes in kernel 6.4:
+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/include/linux/device/class.h?id=1aaba11da9aa
+
+Upstream: https://github.com/nicupavel/emlog/pull/15
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ emlog.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/emlog.c b/emlog.c
+index 4462466..2ead738 100644
+--- a/emlog.c
++++ b/emlog.c
+@@ -500,7 +500,11 @@ static int __init emlog_init(void)
+ 
+     pr_info("version %s running, major is %u, MINOR is %u, max size %d K.\n", EMLOG_VERSION, (unsigned)MAJOR(emlog_dev_type), (unsigned)MINOR(emlog_dev_type), emlog_max_size);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
+     emlog_class = class_create(THIS_MODULE, DEVICE_NAME);
++#else
++    emlog_class = class_create(DEVICE_NAME);
++#endif
+     if (emlog_class == NULL) {
+         pr_err("Can not class_create.\n");
+         ret_val = -4; goto emlog_init_error;
+-- 
+2.39.2
+