diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 00:06:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 00:06:49 +0400 |
| commit | 781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9 (patch) | |
| tree | 5cba2f98482e4612e4daf8e57e4e50a24a273fe9 /Documentation | |
| parent | e990c77d06dbacc8e5c5edd2c4a1005d318a4fa6 (diff) | |
| parent | 9ea77bdb39b62c9bf9fd3cdd1c25a9420bccd380 (diff) | |
| download | linux-781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9.tar.xz | |
Merge branch 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, bios: Make the x86 early memory reservation a kernel option
x86, bios: By default, reserve the low 64K for all BIOSes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index ed05a4a0d242..a2ffd6be0ef7 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2153,6 +2153,11 @@ and is between 256 and 4096 characters. It is defined in the file Reserves a hole at the top of the kernel virtual address space. + reservelow= [X86] + Format: nn[K] + Set the amount of memory to reserve for BIOS at + the bottom of the address space. + reset_devices [KNL] Force drivers to reset the underlying device during initialization. |