From 665bfdc2249597d8ad8a7d409295d8347a054aea Mon Sep 17 00:00:00 2001 From: Brandon Anderson Date: Thu, 29 Feb 2024 18:39:29 +0000 Subject: 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 --- drivers/trusty/trusty-ipc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 #include #include +#include #include #include @@ -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 @@ static int tipc_virtio_probe(struct virtio_device *vdev) 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; -- cgit v1.2.3