[x/azure][PATCH 1/1] Revert "UBUNTU: [Config] azure: CONFIG_HOTPLUG_CPU=n"
Marcelo Henrique Cerri
marcelo.cerri at canonical.com
Thu Mar 28 20:37:18 UTC 2019
BugLink: http://bugs.launchpad.net/bugs/1821934
This reverts commit e6ff6a5eca85593842b906a2728d4cd1ba9c8fd9.
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
debian.azure/config/annotations | 4 ++--
debian.azure/config/config.common.ubuntu | 29 +++++++++++++++++++++---
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 2433924a68bd..23eb2833412a 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -11089,7 +11089,7 @@ CONFIG_PERCPU_STATS policy<{'amd64': 'n', 'arm64': '
CONFIG_GUP_BENCHMARK policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
CONFIG_SCHED_MC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 's390x': 'y'}>
CONFIG_SCHED_SMT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_HOTPLUG_CPU policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_HOTPLUG_CPU policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_NUMA policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_NODES_SHIFT policy<{'amd64': '10', 'arm64': '6', 'ppc64el': '8', 's390x': '4'}>
CONFIG_HIGHPTE policy<{'armhf': 'y', 'i386': 'y'}>
@@ -11110,7 +11110,7 @@ CONFIG_MEM_SOFT_DIRTY flag<REVIEW>
CONFIG_IDLE_PAGE_TRACKING flag<REVIEW> note<is there a cost associated with this?>
CONFIG_PERCPU_STATS flag<REVIEW>
CONFIG_RELOCATABLE flag<REVIEW>
-CONFIG_HOTPLUG_CPU mark<ENFORCED> node<LP:1776293>
+CONFIG_HOTPLUG_CPU flag<REVIEW>
CONFIG_NUMA note<LP:1543165 LP:1557690>
# Menu: Processor type and features >> ARM errata workarounds via the alternatives framework >> Architecture: arm64
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index d1f416381d65..16a851157a14 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -63,6 +63,7 @@ CONFIG_ACPI_EC_DEBUGFS=m
# CONFIG_ACPI_EXTLOG is not set
# CONFIG_ACPI_FAN is not set
CONFIG_ACPI_HED=y
+CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_HOTPLUG_IOAPIC=y
# CONFIG_ACPI_HOTPLUG_MEMORY is not set
CONFIG_ACPI_IPMI=m
@@ -79,6 +80,7 @@ CONFIG_ACPI_PROCESSOR_IDLE=y
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
# CONFIG_ACPI_SBS is not set
+CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
# CONFIG_ACPI_TABLE_UPGRADE is not set
# CONFIG_ACPI_THERMAL is not set
@@ -185,6 +187,7 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
CONFIG_ARCH_HAS_ZONE_DEVICE=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HIBERNATION_HEADER=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_ARCH_MEMORY_PROBE=y
@@ -473,6 +476,7 @@ CONFIG_BOARD_TPCI200=m
CONFIG_BONDING=m
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -737,6 +741,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
@@ -952,6 +957,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
@@ -1683,7 +1689,8 @@ CONFIG_HDM_DIM2=m
CONFIG_HFSPLUS_FS=m
CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_HFS_FS=m
-# CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
CONFIG_HID=m
CONFIG_HIDRAW=y
# CONFIG_HID_A4TECH is not set
@@ -1757,7 +1764,7 @@ CONFIG_HIST_TRIGGERS=y
CONFIG_HMC6352=m
CONFIG_HMM=y
CONFIG_HMM_MIRROR=y
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HOTPLUG_CPU=y
CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
@@ -2344,6 +2351,7 @@ CONFIG_KEXEC=y
CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
CONFIG_KEXEC_CORE=y
CONFIG_KEXEC_FILE=y
+CONFIG_KEXEC_JUMP=y
CONFIG_KEXEC_VERIFY_SIG=y
# CONFIG_KEYBOARD_ADP5588 is not set
# CONFIG_KEYBOARD_ADP5589 is not set
@@ -3513,13 +3521,25 @@ CONFIG_PMC_ATOM=y
CONFIG_PMIC_DA9052=y
# CONFIG_PMIC_OPREGION is not set
CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_AUTOSLEEP is not set
CONFIG_PM_CLK=y
CONFIG_PM_DEBUG=y
CONFIG_PM_DEVFREQ=y
CONFIG_PM_DEVFREQ_EVENT=y
CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
CONFIG_PM_OPP=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_STD_PARTITION=""
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNFS_FLEXFILE_LAYOUT=m
@@ -4439,7 +4459,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUN_PARTITION=y
CONFIG_SURFACE3_WMI=m
# CONFIG_SURFACE_PRO3_BUTTON is not set
-# CONFIG_SUSPEND is not set
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
CONFIG_SWPHY=y
@@ -4730,6 +4752,7 @@ CONFIG_VSOCKMON=m
CONFIG_VT=y
CONFIG_VT6655=m
CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_VXFS_FS=m
CONFIG_VXLAN=m
--
2.17.1
More information about the kernel-team
mailing list