[Karmic][SRU] [Config] Enable all CGROUP configuration options

[Tim Gardner]

Stefan Bader wrote:
> SRU Justification:
> 
> Impact: LXC (Linux containers) need two other options set to work correctly.
> The options should only affect the usage of cgroups.
> 
> Fix: Enable those options as they have been in Lucid now for a while and
> also make them consistent over all of ports and main.
> 
> ---
> 
> From c67b8dd0794510a0d886eb935e9bce2c0dd953a8 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader at canonical.com>
> Date: Tue, 16 Feb 2010 09:57:43 +0100
> Subject: [PATCH] UBUNTU: [Config] Enable all CGROUP configuration options
> 
> BugLink: http://bugs.launchpad.net/bugs/480739
> 
> These options are needed for Linux Containers to work. We changed those
> to the same values in Lucid (without finding regressions).
> So now take those changes back to Karmic and also make the options for
> ports match up with the ones for common.ubuntu.
> 
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  debian.master/config/config.common.ports           |    8 ++++++--
>  debian.master/config/config.common.ubuntu          |    4 ++--
>  debian.master/config/ia64/config.common.ia64       |    1 -
>  debian.master/config/powerpc/config.common.powerpc |    1 -
>  debian.master/config/sparc/config.common.sparc     |    1 -
>  5 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
> index 4e22aeb..80f7e0a 100644
> --- a/debian.master/config/config.common.ports
> +++ b/debian.master/config/config.common.ports
> @@ -424,9 +424,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
>  CONFIG_CFG80211=m
>  CONFIG_CFG80211_DEBUGFS=y
>  CONFIG_CGROUPS=y
> -# CONFIG_CGROUP_CPUACCT is not set
> +CONFIG_CGROUP_CPUACCT=y
>  # CONFIG_CGROUP_DEBUG is not set
> +CONFIG_CGROUP_DEVICE=y
>  CONFIG_CGROUP_FREEZER=y
> +CONFIG_CGROUP_MEM_RES_CTLR=y
> +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
>  CONFIG_CGROUP_NS=y
>  # CONFIG_CGROUP_SCHED is not set
>  CONFIG_CHARGER_PCF50633=m
> @@ -1729,6 +1732,7 @@ CONFIG_MMC_VIA_SDMMC=m
>  CONFIG_MMC_WBSD=m
>  CONFIG_MMTIMER=y
>  CONFIG_MMU=y
> +CONFIG_MM_OWNER=y
>  CONFIG_MODULES=y
>  # CONFIG_MODULE_FORCE_LOAD is not set
>  # CONFIG_MODULE_FORCE_UNLOAD is not set
> @@ -2475,7 +2479,7 @@ CONFIG_REISERFS_FS_XATTR=y
>  # CONFIG_REISERFS_PROC_INFO is not set
>  CONFIG_RELAY=y
>  # CONFIG_RELOCATABLE is not set
> -# CONFIG_RESOURCE_COUNTERS is not set
> +CONFIG_RESOURCE_COUNTERS=y
>  CONFIG_RFD_FTL=m
>  CONFIG_RFKILL=m
>  CONFIG_RFKILL_INPUT=y
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 3f0ed32..58d64ab 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -439,10 +439,10 @@ CONFIG_CFG80211_REG_DEBUG=y
>  CONFIG_CGROUPS=y
>  CONFIG_CGROUP_CPUACCT=y
>  # CONFIG_CGROUP_DEBUG is not set
> -# CONFIG_CGROUP_DEVICE is not set
> +CONFIG_CGROUP_DEVICE=y
>  CONFIG_CGROUP_FREEZER=y
>  CONFIG_CGROUP_MEM_RES_CTLR=y
> -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
> +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
>  CONFIG_CGROUP_NS=y
>  CONFIG_CGROUP_SCHED=y
>  CONFIG_CHARGER_PCF50633=m
> diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
> index 921c1ae..7249a66 100644
> --- a/debian.master/config/ia64/config.common.ia64
> +++ b/debian.master/config/ia64/config.common.ia64
> @@ -21,7 +21,6 @@ CONFIG_BLK_DEV_LOOP=m
>  CONFIG_BSD_DISKLABEL=y
>  CONFIG_BT=m
>  # CONFIG_CFG80211_REG_DEBUG is not set
> -# CONFIG_CGROUP_DEVICE is not set
>  CONFIG_CHR_DEV_SCH=m
>  CONFIG_CPU_FREQ=y
>  # CONFIG_CPU_FREQ_PMAC64 is not set
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index e021429..8d12cbc 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -19,7 +19,6 @@ CONFIG_BONDING=m
>  CONFIG_BRIDGE_NF_EBTABLES=m
>  CONFIG_BSD_DISKLABEL=y
>  CONFIG_BT=m
> -CONFIG_CGROUP_DEVICE=y
>  CONFIG_CHR_DEV_SCH=m
>  CONFIG_CPU_FREQ=y
>  CONFIG_CPU_FREQ_PMAC64=y
> diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
> index 600ed74..d35fc1e 100644
> --- a/debian.master/config/sparc/config.common.sparc
> +++ b/debian.master/config/sparc/config.common.sparc
> @@ -23,7 +23,6 @@ CONFIG_BRIDGE_NF_EBTABLES=m
>  # CONFIG_BSD_DISKLABEL is not set
>  # CONFIG_BT is not set
>  # CONFIG_CFG80211_REG_DEBUG is not set
> -CONFIG_CGROUP_DEVICE=y
>  # CONFIG_CHR_DEV_SCH is not set
>  # CONFIG_CPU_FREQ is not set
>  # CONFIG_CPU_FREQ_PMAC64 is not set

Acked-by: Tim Gardner <tim.gardner at canonical.com>

-- 
Tim Gardner tim.gardner at canonical.com