UBUNTU: [Config] CONFIG_LIVEPATCH=y for s390x

BugLink: http://bugs.launchpad.net/bugs/1633577
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6b6079d75a3aa2b4f6f14364fc18aaf496b59d24..8a227427d78c6da889da813c496a34973ff4348d 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -165,7 +165,6 @@ CONFIG_KVM=m
 CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
-CONFIG_LIVEPATCH=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b0dac7a841a6405db84985a46cc07fb88c242d44..81cf55657a80f21769d045e441bec293e819a2b0 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4214,6 +4214,7 @@ CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_ZILOG=m
 CONFIG_LIS3L02DQ=m
 CONFIG_LITELINK_DONGLE=m
+CONFIG_LIVEPATCH=y
 # CONFIG_LKDTM is not set
 CONFIG_LLC=m
 CONFIG_LOCALVERSION=""

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 2ab8f3a175c825c93b9e609430fe0b79d1ada495..81f22f85efddecdcb0bf0b57d70aa593295810f9 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -138,7 +138,6 @@ CONFIG_KVM=y
 # CONFIG_LAPB is not set
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LIBNVDIMM is not set
-# CONFIG_LIVEPATCH is not set
 # CONFIG_LLC2 is not set
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_LPC_ICH is not set