public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] cgroups: clean up Kconfig
@ 2009-01-09  2:16 Li Zefan
  2009-01-09 21:16 ` Paul Menage
  2009-01-09 22:33 ` Balbir Singh
  0 siblings, 2 replies; 3+ messages in thread
From: Li Zefan @ 2009-01-09  2:16 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Paul Menage, Balbir Singh, KAMEZAWA Hiroyuki, LKML,
	Linux Containers

- move CONFIG_PROC_PID_CPUSET into cgroup menu
- move MM_OWNER to the bottom for better menu indent
- fix typos
- use tabs not spaces

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 init/Kconfig |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/init/Kconfig b/init/Kconfig
index a724a14..56fd93c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -328,11 +328,10 @@ config CGROUP_SCHED
 
 endchoice
 
-menu "Control Group support"
-config CGROUPS
-	bool "Control Group support"
+menuconfig CGROUPS
+	boolean "Control Group support"
 	help
-	  This option add support for grouping sets of processes together, for
+	  This option adds support for grouping sets of processes together, for
 	  use with process control subsystems such as Cpusets, CFS, memory
 	  controls or device isolation.
 	  See
@@ -343,6 +342,8 @@ config CGROUPS
 
 	  Say N if unsure.
 
+if CGROUPS
+
 config CGROUP_DEBUG
 	bool "Example debug cgroup subsystem"
 	depends on CGROUPS
@@ -350,24 +351,24 @@ config CGROUP_DEBUG
 	help
 	  This option enables a simple cgroup subsystem that
 	  exports useful debugging information about the cgroups
-	  framework
+	  framework.
 
-	  Say N if unsure
+	  Say N if unsure.
 
 config CGROUP_NS
-        bool "Namespace cgroup subsystem"
-        depends on CGROUPS
-        help
-          Provides a simple namespace cgroup subsystem to
-          provide hierarchical naming of sets of namespaces,
-          for instance virtual servers and checkpoint/restart
-          jobs.
+	bool "Namespace cgroup subsystem"
+	depends on CGROUPS
+	help
+	  Provides a simple namespace cgroup subsystem to
+	  provide hierarchical naming of sets of namespaces,
+	  for instance virtual servers and checkpoint/restart
+	  jobs.
 
 config CGROUP_FREEZER
-        bool "control group freezer subsystem"
-        depends on CGROUPS
-        help
-          Provides a way to freeze and unfreeze all tasks in a
+	bool "Freezer cgroup subsystem"
+	depends on CGROUPS
+	help
+	  Provides a way to freeze and unfreeze all tasks in a
 	  cgroup.
 
 config CGROUP_DEVICE
@@ -388,18 +389,23 @@ config CPUSETS
 
 	  Say N if unsure.
 
+config PROC_PID_CPUSET
+	bool "Include legacy /proc/<pid>/cpuset file"
+	depends on CPUSETS
+	default y
+
 config CGROUP_CPUACCT
 	bool "Simple CPU accounting cgroup subsystem"
 	depends on CGROUPS
 	help
 	  Provides a simple Resource Controller for monitoring the
-	  total CPU consumed by the tasks in a cgroup
+	  total CPU consumed by the tasks in a cgroup.
 
 config RESOURCE_COUNTERS
 	bool "Resource counters"
 	help
 	  This option enables controller independent resource accounting
-          infrastructure that works with cgroups
+	  infrastructure that works with cgroups.
 	depends on CGROUPS
 
 config CGROUP_MEM_RES_CTLR
@@ -425,9 +431,6 @@ config CGROUP_MEM_RES_CTLR
 	  This config option also selects MM_OWNER config option, which
 	  could in turn add some fork/exit overhead.
 
-config MM_OWNER
-	bool
-
 config CGROUP_MEM_RES_CTLR_SWAP
 	bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
 	depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
@@ -444,8 +447,10 @@ config CGROUP_MEM_RES_CTLR_SWAP
 	  there will be no overhead from this. Even when you set this config=y,
 	  if boot option "noswapaccount" is set, swap will not be accounted.
 
+endif # CGROUPS
 
-endmenu
+config MM_OWNER
+	bool
 
 config SYSFS_DEPRECATED
 	bool
@@ -483,11 +488,6 @@ config SYSFS_DEPRECATED_V2
 	  if the original kernel, that came with your distribution, has
 	  this option set to N.
 
-config PROC_PID_CPUSET
-	bool "Include legacy /proc/<pid>/cpuset file"
-	depends on CPUSETS
-	default y
-
 config RELAY
 	bool "Kernel->user space relay support (formerly relayfs)"
 	help
-- 
1.5.4.rc3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] cgroups: clean up Kconfig
  2009-01-09  2:16 [PATCH] cgroups: clean up Kconfig Li Zefan
@ 2009-01-09 21:16 ` Paul Menage
  2009-01-09 22:33 ` Balbir Singh
  1 sibling, 0 replies; 3+ messages in thread
From: Paul Menage @ 2009-01-09 21:16 UTC (permalink / raw)
  To: Li Zefan
  Cc: Andrew Morton, Balbir Singh, KAMEZAWA Hiroyuki, LKML,
	Linux Containers

On Thu, Jan 8, 2009 at 6:16 PM, Li Zefan <lizf@cn.fujitsu.com> wrote:
> - move CONFIG_PROC_PID_CPUSET into cgroup menu
> - move MM_OWNER to the bottom for better menu indent
> - fix typos
> - use tabs not spaces
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

Acked-by: Paul Menage <menage@google.com>

Thanks.

> ---
>  init/Kconfig |   56 ++++++++++++++++++++++++++++----------------------------
>  1 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/init/Kconfig b/init/Kconfig
> index a724a14..56fd93c 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -328,11 +328,10 @@ config CGROUP_SCHED
>
>  endchoice
>
> -menu "Control Group support"
> -config CGROUPS
> -       bool "Control Group support"
> +menuconfig CGROUPS
> +       boolean "Control Group support"
>        help
> -         This option add support for grouping sets of processes together, for
> +         This option adds support for grouping sets of processes together, for
>          use with process control subsystems such as Cpusets, CFS, memory
>          controls or device isolation.
>          See
> @@ -343,6 +342,8 @@ config CGROUPS
>
>          Say N if unsure.
>
> +if CGROUPS
> +
>  config CGROUP_DEBUG
>        bool "Example debug cgroup subsystem"
>        depends on CGROUPS
> @@ -350,24 +351,24 @@ config CGROUP_DEBUG
>        help
>          This option enables a simple cgroup subsystem that
>          exports useful debugging information about the cgroups
> -         framework
> +         framework.
>
> -         Say N if unsure
> +         Say N if unsure.
>
>  config CGROUP_NS
> -        bool "Namespace cgroup subsystem"
> -        depends on CGROUPS
> -        help
> -          Provides a simple namespace cgroup subsystem to
> -          provide hierarchical naming of sets of namespaces,
> -          for instance virtual servers and checkpoint/restart
> -          jobs.
> +       bool "Namespace cgroup subsystem"
> +       depends on CGROUPS
> +       help
> +         Provides a simple namespace cgroup subsystem to
> +         provide hierarchical naming of sets of namespaces,
> +         for instance virtual servers and checkpoint/restart
> +         jobs.
>
>  config CGROUP_FREEZER
> -        bool "control group freezer subsystem"
> -        depends on CGROUPS
> -        help
> -          Provides a way to freeze and unfreeze all tasks in a
> +       bool "Freezer cgroup subsystem"
> +       depends on CGROUPS
> +       help
> +         Provides a way to freeze and unfreeze all tasks in a
>          cgroup.
>
>  config CGROUP_DEVICE
> @@ -388,18 +389,23 @@ config CPUSETS
>
>          Say N if unsure.
>
> +config PROC_PID_CPUSET
> +       bool "Include legacy /proc/<pid>/cpuset file"
> +       depends on CPUSETS
> +       default y
> +
>  config CGROUP_CPUACCT
>        bool "Simple CPU accounting cgroup subsystem"
>        depends on CGROUPS
>        help
>          Provides a simple Resource Controller for monitoring the
> -         total CPU consumed by the tasks in a cgroup
> +         total CPU consumed by the tasks in a cgroup.
>
>  config RESOURCE_COUNTERS
>        bool "Resource counters"
>        help
>          This option enables controller independent resource accounting
> -          infrastructure that works with cgroups
> +         infrastructure that works with cgroups.
>        depends on CGROUPS
>
>  config CGROUP_MEM_RES_CTLR
> @@ -425,9 +431,6 @@ config CGROUP_MEM_RES_CTLR
>          This config option also selects MM_OWNER config option, which
>          could in turn add some fork/exit overhead.
>
> -config MM_OWNER
> -       bool
> -
>  config CGROUP_MEM_RES_CTLR_SWAP
>        bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
>        depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
> @@ -444,8 +447,10 @@ config CGROUP_MEM_RES_CTLR_SWAP
>          there will be no overhead from this. Even when you set this config=y,
>          if boot option "noswapaccount" is set, swap will not be accounted.
>
> +endif # CGROUPS
>
> -endmenu
> +config MM_OWNER
> +       bool
>
>  config SYSFS_DEPRECATED
>        bool
> @@ -483,11 +488,6 @@ config SYSFS_DEPRECATED_V2
>          if the original kernel, that came with your distribution, has
>          this option set to N.
>
> -config PROC_PID_CPUSET
> -       bool "Include legacy /proc/<pid>/cpuset file"
> -       depends on CPUSETS
> -       default y
> -
>  config RELAY
>        bool "Kernel->user space relay support (formerly relayfs)"
>        help
> --
> 1.5.4.rc3
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] cgroups: clean up Kconfig
  2009-01-09  2:16 [PATCH] cgroups: clean up Kconfig Li Zefan
  2009-01-09 21:16 ` Paul Menage
@ 2009-01-09 22:33 ` Balbir Singh
  1 sibling, 0 replies; 3+ messages in thread
From: Balbir Singh @ 2009-01-09 22:33 UTC (permalink / raw)
  To: Li Zefan
  Cc: Andrew Morton, Paul Menage, KAMEZAWA Hiroyuki, LKML,
	Linux Containers

* Li Zefan <lizf@cn.fujitsu.com> [2009-01-09 10:16:16]:

> - move CONFIG_PROC_PID_CPUSET into cgroup menu
> - move MM_OWNER to the bottom for better menu indent
> - fix typos
> - use tabs not spaces
> 
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
> ---
>  init/Kconfig |   56 ++++++++++++++++++++++++++++----------------------------
>  1 files changed, 28 insertions(+), 28 deletions(-)
> 
> diff --git a/init/Kconfig b/init/Kconfig
> index a724a14..56fd93c 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -328,11 +328,10 @@ config CGROUP_SCHED
> 
>  endchoice
> 
> -menu "Control Group support"
> -config CGROUPS
> -	bool "Control Group support"
> +menuconfig CGROUPS
> +	boolean "Control Group support"
>  	help
> -	  This option add support for grouping sets of processes together, for
> +	  This option adds support for grouping sets of processes together, for
>  	  use with process control subsystems such as Cpusets, CFS, memory
>  	  controls or device isolation.
>  	  See
> @@ -343,6 +342,8 @@ config CGROUPS
> 
>  	  Say N if unsure.
> 
> +if CGROUPS
> +
>  config CGROUP_DEBUG
>  	bool "Example debug cgroup subsystem"
>  	depends on CGROUPS
> @@ -350,24 +351,24 @@ config CGROUP_DEBUG
>  	help
>  	  This option enables a simple cgroup subsystem that
>  	  exports useful debugging information about the cgroups
> -	  framework
> +	  framework.
> 
> -	  Say N if unsure
> +	  Say N if unsure.
> 
>  config CGROUP_NS
> -        bool "Namespace cgroup subsystem"
> -        depends on CGROUPS
> -        help
> -          Provides a simple namespace cgroup subsystem to
> -          provide hierarchical naming of sets of namespaces,
> -          for instance virtual servers and checkpoint/restart
> -          jobs.
> +	bool "Namespace cgroup subsystem"
> +	depends on CGROUPS
> +	help
> +	  Provides a simple namespace cgroup subsystem to
> +	  provide hierarchical naming of sets of namespaces,
> +	  for instance virtual servers and checkpoint/restart
> +	  jobs.
> 
>  config CGROUP_FREEZER
> -        bool "control group freezer subsystem"
> -        depends on CGROUPS
> -        help
> -          Provides a way to freeze and unfreeze all tasks in a
> +	bool "Freezer cgroup subsystem"
> +	depends on CGROUPS
> +	help
> +	  Provides a way to freeze and unfreeze all tasks in a
>  	  cgroup.
> 
>  config CGROUP_DEVICE
> @@ -388,18 +389,23 @@ config CPUSETS
> 
>  	  Say N if unsure.
> 
> +config PROC_PID_CPUSET
> +	bool "Include legacy /proc/<pid>/cpuset file"
> +	depends on CPUSETS
> +	default y
> +
>  config CGROUP_CPUACCT
>  	bool "Simple CPU accounting cgroup subsystem"
>  	depends on CGROUPS
>  	help
>  	  Provides a simple Resource Controller for monitoring the
> -	  total CPU consumed by the tasks in a cgroup
> +	  total CPU consumed by the tasks in a cgroup.
> 
>  config RESOURCE_COUNTERS
>  	bool "Resource counters"
>  	help
>  	  This option enables controller independent resource accounting
> -          infrastructure that works with cgroups
> +	  infrastructure that works with cgroups.
>  	depends on CGROUPS
> 
>  config CGROUP_MEM_RES_CTLR
> @@ -425,9 +431,6 @@ config CGROUP_MEM_RES_CTLR
>  	  This config option also selects MM_OWNER config option, which
>  	  could in turn add some fork/exit overhead.
> 
> -config MM_OWNER
> -	bool
> -
>  config CGROUP_MEM_RES_CTLR_SWAP
>  	bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
>  	depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
> @@ -444,8 +447,10 @@ config CGROUP_MEM_RES_CTLR_SWAP
>  	  there will be no overhead from this. Even when you set this config=y,
>  	  if boot option "noswapaccount" is set, swap will not be accounted.
> 
> +endif # CGROUPS
> 
> -endmenu
> +config MM_OWNER
> +	bool
> 
>  config SYSFS_DEPRECATED
>  	bool
> @@ -483,11 +488,6 @@ config SYSFS_DEPRECATED_V2
>  	  if the original kernel, that came with your distribution, has
>  	  this option set to N.
> 
> -config PROC_PID_CPUSET
> -	bool "Include legacy /proc/<pid>/cpuset file"
> -	depends on CPUSETS
> -	default y
> -
>  config RELAY
>  	bool "Kernel->user space relay support (formerly relayfs)"
>  	help
> -- 
> 1.5.4.rc3
> 

Looks good to me

Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>

-- 
	Balbir

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-01-09 22:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-09  2:16 [PATCH] cgroups: clean up Kconfig Li Zefan
2009-01-09 21:16 ` Paul Menage
2009-01-09 22:33 ` Balbir Singh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox