diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index a6c007816bd9..73bd835d6aad 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -4,7 +4,7 @@
 #
 
 asflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS
-ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS
+ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS -D__DISABLE_TRACE_MMIO__
 
 hostprogs := gen-hyprel
 HOST_EXTRACFLAGS += -I$(objtree)/include
diff --git a/include/linux/log_mmiorw.h b/include/linux/log_mmiorw.h
index b42ef5ac8d99..a7cc101cd881 100644
--- a/include/linux/log_mmiorw.h
+++ b/include/linux/log_mmiorw.h
@@ -13,9 +13,9 @@
  * TODO - io.h is included in NVHE files and these tracepoints are getting
  * enabled for NVHE too. To avoid these tracepoints enabling in NHVE below
  * condition is introduced.
- * !(defined(__KVM_NVHE_HYPERVISOR__))
+ * !(defined(__DISABLE_TRACE_MMIO__))
  */
-#if IS_ENABLED(CONFIG_TRACE_MMIO_ACCESS) && !(defined(__KVM_NVHE_HYPERVISOR__))
+#if IS_ENABLED(CONFIG_TRACE_MMIO_ACCESS) && !(defined(__DISABLE_TRACE_MMIO__))
 DECLARE_TRACEPOINT(rwmmio_write);
 DECLARE_TRACEPOINT(rwmmio_read);
 DECLARE_TRACEPOINT(rwmmio_post_read);