Merge pull request #498 from jongwu/nic

kernel: disable pci shpc hotplug for arm64
kata-containers · May 20, 2019 · 4d8d841 · 4d8d841
2 parents 8f1e486 + 72054cd
commit 4d8d841
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/kernel/configs/arm64_kata_kvm_4.19.x b/kernel/configs/arm64_kata_kvm_4.19.x
@@ -286,7 +286,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
 CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_SHPC=y
+# CONFIG_HOTPLUG_PCI_SHPC is not set
 
 #
 # PCI controller drivers

diff --git a/kernel/kata_config_version b/kernel/kata_config_version
@@ -1 +1 @@
-39
+40