From 99ae008e56274fc8c1fc0660111987b86216b84f Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Tue, 15 Nov 2016 11:13:43 -0600 Subject: [PATCH] UBUNTU: [Config] Set CONFIG_KEXEC=y for all architectures Also update the annotations file. Signed-off-by: Seth Forshee --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.flavour.generic | 1 - debian.master/config/powerpc/config.flavour.powerpc-e500mc | 1 - debian.master/config/powerpc/config.flavour.powerpc-smp | 1 - debian.master/config/powerpc/config.flavour.powerpc64-emb | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 12 files changed, 2 insertions(+), 11 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index f7053cc3e5a3..d7651b9c831f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -189,7 +189,6 @@ CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y CONFIG_KARMA_PARTITION=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set -CONFIG_KEXEC=y CONFIG_KVM=m CONFIG_LAPB=m CONFIG_LDM_PARTITION=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 944ec6e6006f..4c6e70314b70 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -50,7 +50,7 @@ CONFIG_64BIT policy<{'amd64': 'y', 'arm64': ' # Menu: Boot options CONFIG_CMDLINE policy<{'arm64': '"console=ttyAMA0"', 'armhf': '""'}> -CONFIG_KEXEC policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc-generic': 'y', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_KEXEC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc-powerpc64-emb': 'y', 'powerpc-generic': 'y', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CRASH_DUMP policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc-powerpc64-emb': 'y', 'powerpc-generic': 'y', 'powerpc-powerpc-e500mc': 'n', 'powerpc-powerpc-smp': 'n', 'ppc64el': 'y', 's390x': 'y'}> # CONFIG_CRASH_DUMP mark note diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index d73a203a5c29..442396523499 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -204,7 +204,6 @@ CONFIG_JME=m CONFIG_JUMP_LABEL=y # CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set CONFIG_KARMA_PARTITION=y -# CONFIG_KEXEC is not set CONFIG_KVM=y CONFIG_LAPB=m CONFIG_LDM_PARTITION=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 25d3d96a29ad..97743e7c7022 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -190,7 +190,6 @@ CONFIG_JME=m CONFIG_KARMA_PARTITION=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set -CONFIG_KEXEC=y CONFIG_KVM=y CONFIG_LAPB=m CONFIG_LDM_PARTITION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index cdcec9808608..542955e13635 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4238,6 +4238,7 @@ CONFIG_KEMPLD_WDT=m # CONFIG_KERNEL_LZO is not set CONFIG_KERNEL_MODE_NEON=y CONFIG_KERNFS=y +CONFIG_KEXEC=y CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC_FILE=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 6c3281c5eb76..37f14e770308 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -186,7 +186,6 @@ CONFIG_JUMP_LABEL=y CONFIG_KARMA_PARTITION=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set -CONFIG_KEXEC=y CONFIG_KVM=m CONFIG_LAPB=m CONFIG_LDM_PARTITION=y diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic index 082fd684f72b..8b5684f93a87 100644 --- a/debian.master/config/powerpc/config.flavour.generic +++ b/debian.master/config/powerpc/config.flavour.generic @@ -38,7 +38,6 @@ CONFIG_HUGETLB_PAGE=y CONFIG_IMA=y # CONFIG_IWLWIFI_PCIE_RTPM is not set CONFIG_KERNEL_START=0xc000000000000000 -CONFIG_KEXEC=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 # CONFIG_MEDIA_CONTROLLER_DVB is not set CONFIG_MEMORY_HOTPLUG=y diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc index 80f04ab8b7e9..73aceb7353b0 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc +++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc @@ -38,7 +38,6 @@ CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y CONFIG_IMA=y CONFIG_IWLWIFI_PCIE_RTPM=y CONFIG_KERNEL_START=0xc0000000 -CONFIG_KEXEC=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 CONFIG_MEDIA_CONTROLLER_DVB=y # CONFIG_MMIO_NVRAM is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index c6e7d0484f6a..083d28f4e7b6 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -38,7 +38,6 @@ CONFIG_HOTPLUG_CPU=y CONFIG_IMA=y # CONFIG_IWLWIFI_PCIE_RTPM is not set CONFIG_KERNEL_START=0xc0000000 -CONFIG_KEXEC=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 # CONFIG_MEDIA_CONTROLLER_DVB is not set # CONFIG_MMIO_NVRAM is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb index e20ea087e370..b762cc470aac 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-emb +++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb @@ -38,7 +38,6 @@ CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y # CONFIG_IMA is not set CONFIG_IWLWIFI_PCIE_RTPM=y CONFIG_KERNEL_START=0xc000000000000000 -# CONFIG_KEXEC is not set CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 CONFIG_MEDIA_CONTROLLER_DVB=y # CONFIG_MEMORY_HOTPLUG is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index c29a967cbbec..d93104e687a3 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -197,7 +197,6 @@ CONFIG_KARMA_PARTITION=y CONFIG_KERNEL_GZIP=y CONFIG_KERNEL_START=0xc000000000000000 # CONFIG_KERNEL_XZ is not set -CONFIG_KEXEC=y CONFIG_KVM=y CONFIG_LAPB=m CONFIG_LDM_PARTITION=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 2067c0ef2a3b..a095738aae81 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -151,7 +151,6 @@ CONFIG_JUMP_LABEL=y # CONFIG_KARMA_PARTITION is not set # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_XZ=y -CONFIG_KEXEC=y CONFIG_KVM=y # CONFIG_LAPB is not set # CONFIG_LDM_PARTITION is not set -- 2.39.5