diff --git a/core/shared_mem.c b/core/shared_mem.c
index ab815ac899bd2179d1c234b28b459bff4b93aa0b..2a5dd86490767dac605c2d4fbfebb3436ccb3a9a 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 ccc46517df02a0aaefc120274d8331ff77a2b6c5..c03020bcc4e3496a5ae849c231b97749548f4de7 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;