diff --git a/Makefile b/Makefile
index de4f6b10..ea06bf2c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,15 @@ LINUXINCLUDE += -I$(srctree.nvidia-oot)/include
 subdir-ccflags-y += -Werror
 subdir-ccflags-y += -Wmissing-prototypes
 
+LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL))
+LINUX_VERSION_6_4 := $(shell expr 6 \* 256 + 4)
+
+# Changes done in Linux 6.4 onwards
+ifeq ($(shell test $(LINUX_VERSION) -ge $(LINUX_VERSION_6_4); echo $$?),0)
+# Argument on class attribute callback changed to constant type
+subdir-ccflags-y += -DNV_CLASS_ATTRIBUTE_STRUCT_HAS_CONST_STRUCT_CLASS_ARG
+endif
+
 ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
 subdir-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
 endif
diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
index 3b85a97b..8210c371 100644
--- a/drivers/virt/tegra/tegra_hv.c
+++ b/drivers/virt/tegra/tegra_hv.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #include <nvidia/conftest.h>
@@ -393,8 +393,13 @@ static void tegra_hv_cleanup(struct tegra_hv_data *hvd)
 	}
 }
 
+#if defined(NV_CLASS_ATTRIBUTE_STRUCT_HAS_CONST_STRUCT_CLASS_ARG)
+static ssize_t vmid_show(const struct class *class,
+	const struct class_attribute *attr, char *buf)
+#else
 static ssize_t vmid_show(struct class *class,
 	struct class_attribute *attr, char *buf)
+#endif
 {
 	struct tegra_hv_data *hvd = get_hvd();