From 8260bd357c7a894b9bc9177ee9fc1880f2d5d5ca Mon Sep 17 00:00:00 2001
From: Keir Fraser <keirf@google.com>
Date: Wed, 23 Nov 2022 14:38:03 +0000
Subject: [PATCH] Revert "ANDROID: virtio_balloon: New module parameter "pkvm""

This reverts commit 87bcd3edf3ee7b9d5e76a8090b3f05ea1535026d.

Reason for revert: Memory reclaim capability will be checked by the
host before configuring the virtio_balloon device.

Bug: 240239989
Change-Id: I03e7c39ec6d671babeace4040138b416c7e201cf
Signed-off-by: Keir Fraser <keirf@google.com>
Signed-off-by: Quentin Perret <qperret@google.com>
---
 drivers/virtio/virtio_balloon.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index eb27c82bf0dc..72fe24005bc0 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -18,11 +18,6 @@
 #include <linux/wait.h>
 #include <linux/mm.h>
 #include <linux/page_reporting.h>
-#include <linux/mem_relinquish.h>
-
-static bool pkvm;
-module_param(pkvm, bool, 0);
-MODULE_PARM_DESC(pkvm, "Running on PKVM. Must use MEM_RELINQUISH.");
 
 /*
  * Balloon device works in 4K page units.  So each page is pointed to by
@@ -873,12 +868,6 @@ static int virtballoon_probe(struct virtio_device *vdev)
 	struct virtio_balloon *vb;
 	int err;
 
-	if (pkvm && !kvm_has_memrelinquish_services()) {
-		dev_err(&vdev->dev, "%s failure: pkvm but no memrelinquish\n",
-			__func__);
-		return -EINVAL;
-	}
-
 	if (!vdev->config->get) {
 		dev_err(&vdev->dev, "%s failure: config access disabled\n",
 			__func__);