From 473ac465c396cdc992e49ac936ebfea56e0cb211 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 6 Aug 2013 16:47:51 +0000 Subject: [PATCH] implement #32029 CHECKPOINT restore for x86_&4 --- config | 4 ++-- config.x86_64 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config b/config index 1fb60a7..b3517a8 100644 --- a/config +++ b/config @@ -766,8 +766,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m diff --git a/config.x86_64 b/config.x86_64 index 35b4bac..50992f2 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -164,7 +164,7 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y @@ -744,8 +744,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m