]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Fri, 8 Jul 2005 15:52:42 +0000 (08:52 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 8 Jul 2005 15:52:42 +0000 (08:52 -0700)
Documentation/kernel-parameters.txt

index 4ec75c06bca4b0945b856582ebcd9d84f4c368f8..753db6d8b745d315c33717ff19b788636add16f5 100644 (file)
@@ -758,6 +758,9 @@ running once the system is up.
        maxcpus=        [SMP] Maximum number of processors that an SMP kernel
                        should make use of
 
+       max_addr=[KMG]  [KNL,BOOT,ia64] All physical memory greater than or
+                       equal to this physical address is ignored.
+
        max_luns=       [SCSI] Maximum number of LUNs to probe
                        Should be between 1 and 2^32-1.