diff --git a/drivers/virt/tegra/Makefile b/drivers/virt/tegra/Makefile index 01d515a4..2a0db74e 100644 --- a/drivers/virt/tegra/Makefile +++ b/drivers/virt/tegra/Makefile @@ -4,19 +4,9 @@ # # Makefile for Hypervisor interface # - -LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL)) -LINUX_VERSION_6_2 := $(shell expr 6 \* 256 + 2) - -# tegra_hv is currently broken for Linux v6.2 and so skip for Linux v6.2+ -ifeq ($(shell test $(LINUX_VERSION) -lt $(LINUX_VERSION_6_2); echo $$?),0) ifdef CONFIG_TEGRA_VIRTUALIZATION obj-m += tegra_hv.o endif -else -tegra_hv-y = tegra-hv-dummy.o -obj-m += tegra_hv.o -endif obj-m += tegra_hv_pm_ctl.o obj-m += hvc_sysfs.o obj-m += ivc-cdev.o diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h index 4dd678e3..c516edad 100644 --- a/include/soc/tegra/virt/hv-ivc.h +++ b/include/soc/tegra/virt/hv-ivc.h @@ -32,7 +32,7 @@ struct tegra_hv_ivm_cookie { void *reserved; }; -#if (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE) && defined(CONFIG_TEGRA_VIRTUALIZATION) +#if defined(CONFIG_TEGRA_VIRTUALIZATION) bool is_tegra_hypervisor_mode(void); /** @@ -451,8 +451,6 @@ static inline struct tegra_ivc *tegra_hv_ivc_convert_cookie( { return ERR_PTR(-ENOTSUPP); }; -#endif /* (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE) && - * defined(CONFIG_TEGRA_VIRTUALIZATION) - */ +#endif /* defined(CONFIG_TEGRA_VIRTUALIZATION) */ #endif /* __TEGRA_HV_IVC_H */