diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 12:05:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 12:05:25 +0200 |
| commit | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (patch) | |
| tree | 11c773f780186fdb9fbc9c80a73fb7c8426b1fba /init | |
| parent | 98c2aaf8be5baf7193be37fb28bce8e7327158bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
| download | linux-6c009ecef8cca28c7c09eb16d0802e37915a76e1.tar.gz linux-6c009ecef8cca28c7c09eb16d0802e37915a76e1.tar.bz2 linux-6c009ecef8cca28c7c09eb16d0802e37915a76e1.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: need the upstream facility added by:
7f1e2ca: hrtimer: fix rq->lock inversion (again)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4f647142f2e6..35659ed442e5 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1051,7 +1051,7 @@ source "arch/Kconfig" config SLOW_WORK default n - bool "Enable slow work thread pool" + bool help The slow work thread pool provides a number of dynamically allocated threads that can be used by the kernel to perform operations that @@ -1061,6 +1061,8 @@ config SLOW_WORK by a series of mkdirs and a create call, all of which have to touch disk. + See Documentation/slow-work.txt. + endmenu # General setup config HAVE_GENERIC_DMA_COHERENT |