aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Walle <bwalle@suse.de>2007-10-19 02:41:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 14:53:51 -0400
commitfb391599f2eaf22197e3e914187c957ef7eeb4c5 (patch)
treedfb5a952526b8fc8957ff8502f1f79890f00175d
parent7d7712a385d5b0a6f921dbd9b66ad3aaed387b5e (diff)
Add documentation for extended crashkernel syntax
This adds the documentation for the extended crashkernel syntax into Documentation/kdump/kdump.txt. Signed-off-by: Bernhard Walle <bwalle@suse.de> Cc: Andi Kleen <ak@suse.de> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Vivek Goyal <vgoyal@in.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/kdump/kdump.txt26
-rw-r--r--Documentation/kernel-parameters.txt7
2 files changed, 33 insertions, 0 deletions
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index 1b37b28cc234..d0ac72cc19ff 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -231,6 +231,32 @@ Dump-capture kernel config options (Arch Dependent, ia64)
231 any space below the alignment point will be wasted. 231 any space below the alignment point will be wasted.
232 232
233 233
234Extended crashkernel syntax
235===========================
236
237While the "crashkernel=size[@offset]" syntax is sufficient for most
238configurations, sometimes it's handy to have the reserved memory dependent
239on the value of System RAM -- that's mostly for distributors that pre-setup
240the kernel command line to avoid a unbootable system after some memory has
241been removed from the machine.
242
243The syntax is:
244
245 crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
246 range=start-[end]
247
248For example:
249
250 crashkernel=512M-2G:64M,2G-:128M
251
252This would mean:
253
254 1) if the RAM is smaller than 512M, then don't reserve anything
255 (this is the "rescue" case)
256 2) if the RAM size is between 512M and 2G, then reserve 64M
257 3) if the RAM size is larger than 2G, then reserve 128M
258
259
234Boot into System Kernel 260Boot into System Kernel
235======================= 261=======================
236 262
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 189df0bcab99..0a3fed445249 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -497,6 +497,13 @@ and is between 256 and 4096 characters. It is defined in the file
497 [KNL] Reserve a chunk of physical memory to 497 [KNL] Reserve a chunk of physical memory to
498 hold a kernel to switch to with kexec on panic. 498 hold a kernel to switch to with kexec on panic.
499 499
500 crashkernel=range1:size1[,range2:size2,...][@offset]
501 [KNL] Same as above, but depends on the memory
502 in the running system. The syntax of range is
503 start-[end] where start and end are both
504 a memory unit (amount[KMG]). See also
505 Documentation/kdump/kdump.txt for a example.
506
500 cs4232= [HW,OSS] 507 cs4232= [HW,OSS]
501 Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq> 508 Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
502 509