UBUNTU: [Config] Set CONFIG_KEXEC=y for all architectures

Also update the annotations file.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f7053cc3e5a3913d763483d02659bd66b525defe..d7651b9c831fea3fbec9973b932c95c73e61ed3d 100644 (file)
--- 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 944ec6e6006f99fbe4318329a212382a8d9c771b..4c6e70314b70ae2f1362e0e46f37104b66cafad6 100644 (file)
--- 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<ENFORCED> note<LP:1363180>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index d73a203a5c296ca91bc66ac9089f835d1c4e722c..4423965234993898e3ca35fa89eff126981f7cb7 100644 (file)
--- 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 25d3d96a29ad544a8c88b982e22e0daab43ab54f..97743e7c7022405f4eb6f2efb43a9f251bc1d09a 100644 (file)
--- 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 cdcec98086086a365a6663a2880cf4a213c0c5fd..542955e13635d5a482f68ab3ddefbf9c94200293 100644 (file)
--- 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 6c3281c5eb76b4ab689122ed066423655c516871..37f14e7703086bf5bb7936834e62aa8c7bb9d1a4 100644 (file)
--- 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 082fd684f72b0207851b6ff7e2e08992514e42c3..8b5684f93a871e4e204acc3d60f6fe83fb80f5c8 100644 (file)
--- 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 80f04ab8b7e98e4eaca6875d68e2ddcd8328ba93..73aceb7353b0169a9ecd7f0a591499152b1daebb 100644 (file)
--- 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 c6e7d0484f6a61e4f71402449a2a1845f26ad176..083d28f4e7b6ae0877010a116b97cf64d138cab3 100644 (file)
--- 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 e20ea087e370e1fe327b42bbcb77d849fcbdda76..b762cc470aacf4925c3a2d052ff0962af667faef 100644 (file)
--- 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 c29a967cbbec3ff9acb1c97a9076de7754f43fb6..d93104e687a337b46461aedbc64040504c75d8eb 100644 (file)
--- 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 2067c0ef2a3b66d5e1edb22e544910fa2865c02b..a095738aae819e96f609d214e29d06a1a2000626 100644 (file)
--- 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