diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index dc9301d31f12..5f47ac9680aa 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -2062,12 +2062,13 @@ static long vhost_vring_set_num_addr(struct vhost_dev *d,
 	mutex_lock(&vq->mutex);
 
 #if VHOST_ARCH_CAN_ACCEL_UACCESS
+#if 0
 	/* Unregister MMU notifer to allow invalidation callback
 	 * can access vq->uaddrs[] without holding a lock.
 	 */
 	if (d->mm)
 		mmu_notifier_unregister(&d->mmu_notifier, d->mm);
-
+#endif
 	vhost_uninit_vq_maps(vq);
 #endif
 
@@ -2084,9 +2085,10 @@ static long vhost_vring_set_num_addr(struct vhost_dev *d,
 
 #if VHOST_ARCH_CAN_ACCEL_UACCESS
 	vhost_setup_vq_uaddr(vq);
-
+#if 0
 	if (d->mm)
 		mmu_notifier_register(&d->mmu_notifier, d->mm);
+#endif
 #endif
 
 	mutex_unlock(&vq->mutex);