From 5a0e9cc2d34fb4569f8de1b50353066c7987abc1 Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Thu, 9 Apr 2020 13:55:22 +0800 Subject: [PATCH] config: disable pci shpc hotplug for arm64 Since we disable pci shpc hotplug for arm64, see https://github.com/kata-containers/packaging/pull/498 for detailed reason. We need to move CONFIG_HOTPLUG_PCI_SHPC from common conf to x86_64-specific. Fixes: #1004 Signed-off-by: Penny Zheng Signed-off-by: Jianyong Wu --- kernel/configs/fragments/common/hotplug.conf | 1 - kernel/configs/fragments/x86_64/hotplug.conf | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 kernel/configs/fragments/x86_64/hotplug.conf diff --git a/kernel/configs/fragments/common/hotplug.conf b/kernel/configs/fragments/common/hotplug.conf index 6813c144d..342636aca 100644 --- a/kernel/configs/fragments/common/hotplug.conf +++ b/kernel/configs/fragments/common/hotplug.conf @@ -4,7 +4,6 @@ CONFIG_MEMORY_HOTPLUG=y CONFIG_HOTPLUG_CPU=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_HOTPLUG_PCI_SHPC=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_PNPACPI=y diff --git a/kernel/configs/fragments/x86_64/hotplug.conf b/kernel/configs/fragments/x86_64/hotplug.conf new file mode 100644 index 000000000..7caa5a982 --- /dev/null +++ b/kernel/configs/fragments/x86_64/hotplug.conf @@ -0,0 +1,5 @@ +# Since we disable pci shpc hotplug for arm64, +# See https://github.com/kata-containers/packaging/pull/498 +# for detailed reasons. +# we move this config into x86_64-specific. +CONFIG_HOTPLUG_PCI_SHPC=y