commit 665bfdc2249597d8ad8a7d409295d8347a054aea
author Brandon Anderson <brandonand@google.com> Thu Feb 29 18:39:29 2024 +0000
committer Brandon Anderson <brandonand@google.com> Fri Mar 01 02:12:35 2024 +0000
tree 1d4970238d28004ef61705c03378e7ffb5b90d59
parent b54b57079c4f59fb8b9024bda67771df32b803f5

Trusty driver compat 6.0 register_shrinker()

The Trusty driver from 5.10 needs an additional argument to be
compatible with kernels later than 6.0.

Change-Id: I93598073a558acb0a4278ed8f1d0e419e9797d6e
Bug: 301606895
Signed-off-by: Brandon Anderson <brandonand@google.com>

drivers/trusty/trusty-ipc.c

diff --git a/drivers/trusty/trusty-ipc.c b/drivers/trusty/trusty-ipc.c
index ca05f41..04aa2d1 100644
--- a/drivers/trusty/trusty-ipc.c
+++ b/drivers/trusty/trusty-ipc.c
@@ -18,6 +18,7 @@
 #include <linux/compat.h>
 #include <linux/uio.h>
 #include <linux/file.h>
+#include <linux/version.h>
 
 #include <linux/virtio.h>
 #include <linux/virtio_ids.h>
@@ -50,6 +51,12 @@
 #define TIPC_IOC32_CONNECT	_IOW(TIPC_IOC_MAGIC, 0x80, compat_uptr_t)
 #endif
 
+#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE)
+#define TRUSTY_IPC_REGISTER_SHRINKER_ARG , "trusty-ipc-shrinker"
+#else
+#define TRUSTY_IPC_REGISTER_SHRINKER_ARG
+#endif
+
 struct tipc_virtio_dev;
 
 struct tipc_dev_config {
@@ -2601,7 +2608,9 @@
 	vds->mb_shrinker.seeks = DEFAULT_SEEKS;
 	vds->mb_shrinker.batch = 0;
 
-	err = register_shrinker(&vds->mb_shrinker);
+	err = register_shrinker(&vds->mb_shrinker
+			TRUSTY_IPC_REGISTER_SHRINKER_ARG
+			);
 	if (err) {
 		pr_err("failed to register shrinker: %d\n", err);
 		goto err_register_shrinker;