diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:39:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:39:44 -0400 |
commit | ada3fa15057205b7d3f727bba5cd26b5912e350f (patch) | |
tree | 60962fc9e4021b92f484d1a58e72cd3906d4f3db /Documentation | |
parent | 2f82af08fcc7dc01a7e98a49a5995a77e32a2925 (diff) | |
parent | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
powerpc64: convert to dynamic percpu allocator
sparc64: use embedding percpu first chunk allocator
percpu: kill lpage first chunk allocator
x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
percpu: update embedding first chunk allocator to handle sparse units
percpu: use group information to allocate vmap areas sparsely
vmalloc: implement pcpu_get_vm_areas()
vmalloc: separate out insert_vmalloc_vm()
percpu: add chunk->base_addr
percpu: add pcpu_unit_offsets[]
percpu: introduce pcpu_alloc_info and pcpu_group_info
percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
percpu: add @align to pcpu_fc_alloc_fn_t
percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
percpu: drop @static_size from first chunk allocators
percpu: generalize first chunk allocator selection
percpu: build first chunk allocators selectively
percpu: rename 4k first chunk allocator to page
percpu: improve boot messages
percpu: fix pcpu_reclaim() locking
...
Fix trivial conflict as by Tejun Heo in kernel/sched.c
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 3a238644c811..4c12a290bee5 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1971,11 +1971,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1971 | Format: { 0 | 1 } | 1971 | Format: { 0 | 1 } |
1972 | See arch/parisc/kernel/pdc_chassis.c | 1972 | See arch/parisc/kernel/pdc_chassis.c |
1973 | 1973 | ||
1974 | percpu_alloc= [X86] Select which percpu first chunk allocator to use. | 1974 | percpu_alloc= Select which percpu first chunk allocator to use. |
1975 | Allowed values are one of "lpage", "embed" and "4k". | 1975 | Currently supported values are "embed" and "page". |
1976 | See comments in arch/x86/kernel/setup_percpu.c for | 1976 | Archs may support subset or none of the selections. |
1977 | details on each allocator. This parameter is primarily | 1977 | See comments in mm/percpu.c for details on each |
1978 | for debugging and performance comparison. | 1978 | allocator. This parameter is primarily for debugging |
1979 | and performance comparison. | ||
1979 | 1980 | ||
1980 | pf. [PARIDE] | 1981 | pf. [PARIDE] |
1981 | See Documentation/blockdev/paride.txt. | 1982 | See Documentation/blockdev/paride.txt. |