Lucid SRU, CONFIG_TASK_DELAY_ACCT=y, LP493156

[Brad Figg]

On 01/03/2011 11:45 AM, Tim Gardner wrote:
> The following changes since commit 1aec5ae6df73572c340a50483a3ed9c8621b1da9:
>    Greg Kroah-Hartman (1):
>          Linux 2.6.32.27
>
> are available in the git repository at:
>
>    git://kernel.ubuntu.com/rtg/ubuntu-lucid.git delay-acct-lp493156
>
> Tim Gardner (2):
>        UBUNTU: SAUCE: Change nodelayacct boot parameter polarity.
>        UBUNTU: [Config] CONFIG_TASK_DELAY_ACCT=y
>
>   Documentation/kernel-parameters.txt       |    2 +-
>   debian.master/config/config.common.ports  |    2 +-
>   debian.master/config/config.common.ubuntu |    2 +-
>   kernel/delayacct.c                        |    8 ++++----
>   4 files changed, 7 insertions(+), 7 deletions(-)
>  From 12de726a4519e60c6caf4c629a87e608b46cae6e Mon Sep 17 00:00:00 2001
> From: Tim Gardner<tim.gardner at canonical.com>
> Date: Mon, 3 Jan 2011 11:48:40 -0700
> Subject: [PATCH 1/2] UBUNTU: SAUCE: Change nodelayacct boot parameter polarity.
>
> Make the default behaviour 'delayacct_on=0' before enabling CONFIG_TASK_DELAY_ACCT.
> This preserves the released behaviour of Lucid whilst still providing an avenue
> for iotop users to enable this functionality. e.g., booting with 'delayacct' on
> the grub command line.
>
> BugLink: http://bugs.launchpad.net/bugs/493156
>
> Signed-off-by: Tim Gardner<tim.gardner at canonical.com>
> ---
>   Documentation/kernel-parameters.txt |    2 +-
>   kernel/delayacct.c                  |    8 ++++----
>   2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
> index 5f6aa11..cc1e57f 100644
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@ -1625,7 +1625,7 @@ and is between 256 and 4096 characters. It is defined in the file
>
>   	noclflush	[BUGS=X86] Don't use the CLFLUSH instruction
>
> -	nodelayacct	[KNL] Disable per-task delay accounting
> +	delayacct	[KNL] Enable per-task delay accounting
>
>   	nodisconnect	[HW,SCSI,M68K] Disables SCSI disconnects.
>
> diff --git a/kernel/delayacct.c b/kernel/delayacct.c
> index ead9b61..df380c5 100644
> --- a/kernel/delayacct.c
> +++ b/kernel/delayacct.c
> @@ -20,15 +20,15 @@
>   #include<linux/sysctl.h>
>   #include<linux/delayacct.h>
>
> -int delayacct_on __read_mostly = 1;	/* Delay accounting turned on/off */
> +int delayacct_on __read_mostly = 0;	/* Delay accounting turned on/off */
>   struct kmem_cache *delayacct_cache;
>
> -static int __init delayacct_setup_disable(char *str)
> +static int __init delayacct_setup_enable(char *str)
>   {
> -	delayacct_on = 0;
> +	delayacct_on = 1;
>   	return 1;
>   }
> -__setup("nodelayacct", delayacct_setup_disable);
> +__setup("delayacct", delayacct_setup_enable);
>
>   void delayacct_init(void)
>   {

Looks ok.

Acked-by: Brad Figg<brad.figg at canonical.com>

-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com