From b7cebf944ae9f9e97d9f55bc2ee6d964b4268edd Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 28 Jul 2017 10:41:10 -0700 Subject: [PATCH] enable CHECKPOINT_RESTORE on s390x Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1475719 Fedora - Add new package CRIU for Docker on z Systems Koji: https://koji.fedoraproject.org/koji/taskinfo?taskID=20859205 Testing: The kernel from koji was used to run the CRIU test suite (zdtm) on a RHEL s390x system. The kernel was started using kexec. # ./zdtm.py run -a --keep-going [...] ################## ALL TEST(S) PASSED (TOTAL 317/SKIPPED 31) ################### Signed-off-by: Adrian Reber --- kernel-s390x-debug.config | 3 ++- kernel-s390x.config | 3 ++- kernel.spec | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index a69ba3478..25977b5f7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -654,7 +654,7 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set # CONFIG_CHARGER_SMB347 is not set -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y CONFIG_CHECK_STACK=y CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1=m @@ -2573,6 +2573,7 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set +CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK_DEBUG is not set # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 870bed495..7f0886fc8 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -653,7 +653,7 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set # CONFIG_CHARGER_SMB347 is not set -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y CONFIG_CHECK_STACK=y CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1=m @@ -2552,6 +2552,7 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set +CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK_DEBUG is not set # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m diff --git a/kernel.spec b/kernel.spec index 9ece73879..4832501ee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2195,6 +2195,9 @@ fi # # %changelog +* Fri Jul 28 2017 Adrian Reber +- Enable CHECKPOINT_RESTORE on s390x + * Fri Jul 28 2017 Laura Abbott - 4.13.0-0.rc2.git3.1 - Linux v4.13-rc2-110-g0b5477d9dabd