diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 16:38:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 16:38:52 +1000 |
| commit | f32437f49aa61db4fc98d02630e40aaff7c06e9a (patch) | |
| tree | 0d880fca21de47da8aed28be4cc6d03325f5fbee /Documentation | |
| parent | 4d26dcc989502d0d0459b490668146d04e19e7ef (diff) | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 (diff) | |
Merge commit 'percpu/for-next'
Conflicts:
arch/sh/kernel/vmlinux.lds.S
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 0e4a295be10c..b76e4c3c7061 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1963,11 +1963,12 @@ and is between 256 and 4096 characters. It is defined in the file Format: { 0 | 1 } See arch/parisc/kernel/pdc_chassis.c - percpu_alloc= [X86] Select which percpu first chunk allocator to use. - Allowed values are one of "lpage", "embed" and "4k". - See comments in arch/x86/kernel/setup_percpu.c for - details on each allocator. This parameter is primarily - for debugging and performance comparison. + percpu_alloc= Select which percpu first chunk allocator to use. + Currently supported values are "embed" and "page". + Archs may support subset or none of the selections. + See comments in mm/percpu.c for details on each + allocator. This parameter is primarily for debugging + and performance comparison. pf. [PARIDE] See Documentation/blockdev/paride.txt. |