summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-11 14:08:08 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-11 14:08:08 -0700
commit1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6 (patch)
tree176e2dd02e60942bd1afc7ec45bbb18939461424 /Documentation/kernel-parameters.txt
parenta8400986fb0bff251ac4dd9e2188cf0b59443d3f (diff)
parent3b5cc09033f49d004006acf44e5b05036bd46a85 (diff)
downloadkernel-crypto-1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6.tar.gz
kernel-crypto-1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6.tar.xz
kernel-crypto-1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4ec75c06bca..753db6d8b74 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -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.