From 91bf8d6cacbcbdd946b314e63cbfe9192979288e Mon Sep 17 00:00:00 2001
From: Ram Muthiah <rammuthiah@google.com>
Date: Tue, 20 Jul 2021 16:03:33 -0700
Subject: [PATCH] ANDROID: GKI: Disable CONFIG_VIRTIO_MEM on x86_64

Disabling extraneous x86_64 virtio config that is not used
but is default M.

Bug: 191888995
Test: Treehugger
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
Change-Id: I286d79880417e048b9c502f13518cb9deca9b2ae
---
 arch/x86/configs/gki_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 6655e047bf93..8f5edf9ee17b 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -451,6 +451,7 @@ CONFIG_EDAC=y
 CONFIG_RTC_CLASS=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_UIO=y
+# CONFIG_VIRTIO_MEM is not set
 CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y