| Message ID | 1340258443-12999-1-git-send-email-bryan.wu@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 3b19cba..9505334a 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -31,7 +31,6 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CFG80211_REG_DEBUG=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_CLEANCACHE=y CONFIG_COMPACTION=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 73f72d1..f7b5bed 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -30,7 +30,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_CACHE_L2X0 is not set CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CFG80211_REG_DEBUG=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set CONFIG_CHECKPOINT_RESTORE=y CONFIG_CLEANCACHE=y # CONFIG_COMPACTION is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 2b3d3ab..ea196d1 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -10,7 +10,6 @@ CONFIG_ATM_BR2684_IPFILTER=y CONFIG_AX25_DAMA_SLAVE=y # CONFIG_BLK_DEV_SR_VENDOR is not set -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set # CONFIG_COMPACTION is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CRYPTO_LZO=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1b7941b..ab989c5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -836,6 +836,7 @@ CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_MEM_RES_CTLR=y # CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 4f6266f..70842cd 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -30,7 +30,6 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CFG80211_REG_DEBUG=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_CLEANCACHE=y CONFIG_COMPACTION=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index acca5e2..fe0eb23 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -25,7 +25,6 @@ CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_CAN_C_CAN_PLATFORM=m -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_CLEANCACHE=y # CONFIG_COMPACTION is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index a36e97d..be30ad3 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -29,7 +29,6 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_CAN_C_CAN_PLATFORM=m # CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_CLEANCACHE=y CONFIG_COMPACTION=y
Signed-off-by: Bryan Wu <bryan.wu@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 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.common.powerpc | 1 - debian.master/config/ppc64/config.common.ppc64 | 1 - 7 files changed, 1 insertion(+), 6 deletions(-)