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

1 files changed, 5 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ed05a4a0d24..a2ffd6be0ef 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.