From 0ffa8400b5d0720e4faaa12dc4ad9bf8b5f3046a Mon Sep 17 00:00:00 2001 From: sunwenhou Date: Sat, 15 Nov 2025 17:54:36 +0800 Subject: [PATCH] Fix for linux 6.6 --- core/shared_mem.c | 2 +- core/tc_client_driver.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/shared_mem.c b/core/shared_mem.c index ab815ac..2a5dd86 100644 --- a/core/shared_mem.c +++ b/core/shared_mem.c @@ -116,7 +116,7 @@ void release_shared_mem_page(uint64_t buf, uint32_t buf_size) page = (struct page *)(uintptr_t)phys_to_page(phys_addr[i]); if (page == NULL) continue; - set_bit(PG_dirty, &page->flags); + set_page_dirty_lock(page); put_page(page); } } diff --git a/core/tc_client_driver.c b/core/tc_client_driver.c index ccc4651..c03020b 100644 --- a/core/tc_client_driver.c +++ b/core/tc_client_driver.c @@ -1211,7 +1211,11 @@ static int enable_dev_nodes(void) return 0; } +#if (KERNEL_VERSION(6, 6, 0) <= LINUX_VERSION_CODE) +static char *tee_devnode(const struct device *dev, umode_t *mode) +#else static char *tee_devnode(struct device *dev, umode_t *mode) +#endif { if (strcmp(dev_name(dev), TC_NS_CVM_DEV) == 0) *mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; -- Gitee