diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:38:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:38:45 -0800 |
| commit | 46bbffad54bd48bb809f2691c1970a79a588976b (patch) | |
| tree | 21779a574f118b1cba5d6832bc0a0fa3bee97075 /Documentation | |
| parent | 85fe20bfd415af0a2e93bd1166533d4a6eb591ea (diff) | |
| parent | c1fd1b43831fa20c91cdd461342af8edf2e87c2f (diff) | |
| download | blackbird-op-linux-46bbffad54bd48bb809f2691c1970a79a588976b.tar.gz blackbird-op-linux-46bbffad54bd48bb809f2691c1970a79a588976b.zip | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mm: Unify kernel_physical_mapping_init() API
x86, mm: Allow highmem user page tables to be disabled at boot time
x86: Do not reserve brk for DMI if it's not going to be used
x86: Convert tlbstate_lock to raw_spinlock
x86: Use the generic page_is_ram()
x86: Remove BIOS data range from e820
Move page_is_ram() declaration to mm.h
Generic page_is_ram: use __weak
resources: introduce generic page_is_ram()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index db611e195ebb..8c666d80f0e7 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2718,6 +2718,13 @@ and is between 256 and 4096 characters. It is defined in the file medium is write-protected). Example: quirks=0419:aaf5:rl,0421:0433:rc + userpte= + [X86] Flags controlling user PTE allocations. + + nohigh = do not allocate PTE pages in + HIGHMEM regardless of setting + of CONFIG_HIGHPTE. + vdso= [X86,SH] vdso=2: enable compat VDSO (default with COMPAT_VDSO) vdso=1: enable VDSO (default) |
