From 364739a491ef7f55c7c963c46831ab8487177c2f Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Fri, 28 Feb 2020 18:27:02 +0000 Subject: [PATCH] kernel: x86_64: drop CALGARY IOMMU on 5.4 It's snuck back in on kernel 5.4 configs, so drop it there too. Signed-off-by: Kevin Darbyshire-Bryant --- target/linux/x86/64/config-5.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4 index 7afce44091..ceee923b0f 100644 --- a/target/linux/x86/64/config-5.4 +++ b/target/linux/x86/64/config-5.4 @@ -70,8 +70,8 @@ CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set CONFIG_BTT=y -CONFIG_CALGARY_IOMMU=y -CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +# CONFIG_CALGARY_IOMMU is not set +# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set CONFIG_CONNECTOR=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set -- 2.25.1