diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 12:59:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 12:59:59 -0400 |
| commit | 6948385cbd83201fb933125c1a578b29b456605d (patch) | |
| tree | fd08f30c84d02cfb1ad696d04605565974fae7be /init | |
| parent | 7a76d89232f20411f32e7a79ccc1e2f95e9f826b (diff) | |
| parent | 56b2f0706d82535fd8d85503f2dcc0be40c8e55d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (25 commits)
setlocalversion: do not describe if there is nothing to describe
kconfig: fix typos: "Suport" -> "Support"
kconfig: make defconfig is no longer chatty
kconfig: make oldconfig is now less chatty
kconfig: speed up all*config + randconfig
kconfig: set all new symbols automatically
kconfig: add diffconfig utility
kbuild: remove Module.markers during mrproper
kbuild: sparse needs CF not CHECKFLAGS
kernel-doc: handle/strip __init
vmlinux.lds: move __attribute__((__cold__)) functions back into final .text section
init: fix URL of "The GNU Accounting Utilities"
kbuild: add arch/$ARCH/include to search path
kbuild: asm symlink support for arch/$ARCH/include
kbuild: support arch/$ARCH/include for tags, cscope
kbuild: prepare headers_* for arch/$ARCH/include
kbuild: install all headers when arch is changed
kbuild: make clean removes *.o.* as well
kbuild: optimize headers_* targets
kbuild: only one call for include/ in make headers_*
...
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index a50bdfed2df7..43d6989c275f 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -171,7 +171,7 @@ config BSD_PROCESS_ACCT_V3 | |||
| 171 | process and it's parent. Note that this file format is incompatible | 171 | process and it's parent. Note that this file format is incompatible |
| 172 | with previous v0/v1/v2 file formats, so you will need updated tools | 172 | with previous v0/v1/v2 file formats, so you will need updated tools |
| 173 | for processing it. A preliminary version of these tools is available | 173 | for processing it. A preliminary version of these tools is available |
| 174 | at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>. | 174 | at <http://www.gnu.org/software/acct/>. |
| 175 | 175 | ||
| 176 | config TASKSTATS | 176 | config TASKSTATS |
| 177 | bool "Export task/process statistics through netlink (EXPERIMENTAL)" | 177 | bool "Export task/process statistics through netlink (EXPERIMENTAL)" |
| @@ -486,7 +486,7 @@ config PID_NS | |||
| 486 | default n | 486 | default n |
| 487 | depends on NAMESPACES && EXPERIMENTAL | 487 | depends on NAMESPACES && EXPERIMENTAL |
| 488 | help | 488 | help |
| 489 | Suport process id namespaces. This allows having multiple | 489 | Support process id namespaces. This allows having multiple |
| 490 | process with the same pid as long as they are in different | 490 | process with the same pid as long as they are in different |
| 491 | pid namespaces. This is a building block of containers. | 491 | pid namespaces. This is a building block of containers. |
| 492 | 492 | ||