From 52dbcc7e1d441c3a61cf56b410859be7d6c9e490 Mon Sep 17 00:00:00 2001 From: Marcelo Henrique Cerri Date: Mon, 11 Jun 2018 18:22:54 -0300 Subject: [bionic/azure][PATCH] UBUNTU: [Config] azure: CONFIG_HOTPLUG_CPU=n BugLink: http://bugs.launchpad.net/bugs/1776293 That requires CONFIG_HIBERNATION and CONFIG_SUSPEND to be disabled as well. Signed-off-by: Marcelo Henrique Cerri --- debian.azure/config/annotations | 2 +- debian.azure/config/config.common.ubuntu | 29 +++--------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 7cdeca391bab..29ecd4cd2b80 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -11070,7 +11070,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': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_HOTPLUG_CPU policy<{'amd64': 'n', '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'}> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index eaac88ee22a3..17f06ad0c3d6 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -63,7 +63,6 @@ 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 @@ -80,7 +79,6 @@ 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 @@ -186,7 +184,6 @@ 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 @@ -474,7 +471,6 @@ 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 @@ -736,7 +732,6 @@ 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 @@ -953,7 +948,6 @@ 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,8 +1677,7 @@ CONFIG_HDM_DIM2=m CONFIG_HFSPLUS_FS=m CONFIG_HFSPLUS_FS_POSIX_ACL=y CONFIG_HFS_FS=m -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y +# CONFIG_HIBERNATION is not set CONFIG_HID=m CONFIG_HIDRAW=y # CONFIG_HID_A4TECH is not set @@ -1758,7 +1751,7 @@ CONFIG_HIST_TRIGGERS=y CONFIG_HMC6352=m CONFIG_HMM=y CONFIG_HMM_MIRROR=y -CONFIG_HOTPLUG_CPU=y +# CONFIG_HOTPLUG_CPU is not set CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m @@ -2340,7 +2333,6 @@ 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 @@ -3508,25 +3500,13 @@ 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 @@ -4444,9 +4424,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SUN_PARTITION=y CONFIG_SURFACE3_WMI=m # CONFIG_SURFACE_PRO3_BUTTON is not set -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set +# CONFIG_SUSPEND is not set CONFIG_SWAP=y CONFIG_SWIOTLB=y CONFIG_SWPHY=y @@ -4736,7 +4714,6 @@ 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