aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-09-15 06:38:47 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-09-17 18:54:26 -0400
commite53dd083be96a3272df16a675f14c8396cb744ec (patch)
treea6fe1aea6925935cd054d41b69da2df1b5953b99 /Documentation
parentc2f828977ba5d17c13debba374ea252d18e5ccfb (diff)
Revert "V4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" boot-time option"
This reverts commit 4730d3af625b532e3df5f091b5c8edb08f512fbf. Unfortunately, patch got mangled by a whitespace removal script. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt23
1 files changed, 13 insertions, 10 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 586b6f85d4e0..b41cde31d112 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1,5 +1,5 @@
1 Kernel Parameters 1 Kernel Parameters
2 ~~~~~~~~~~~~~~~~~ 2 ~~~~~~~~~~~~~~~~~
3 3
4The following is a consolidated list of the kernel parameters as implemented 4The following is a consolidated list of the kernel parameters as implemented
5(mostly) by the __setup() macro and sorted into English Dictionary order 5(mostly) by the __setup() macro and sorted into English Dictionary order
@@ -468,6 +468,9 @@ and is between 256 and 4096 characters. It is defined in the file
468 Format: 468 Format:
469 <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>] 469 <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
470 470
471 cpia_pp= [HW,PPT]
472 Format: { parport<nr> | auto | none }
473
471 crashkernel=nn[KMG]@ss[KMG] 474 crashkernel=nn[KMG]@ss[KMG]
472 [KNL] Reserve a chunk of physical memory to 475 [KNL] Reserve a chunk of physical memory to
473 hold a kernel to switch to with kexec on panic. 476 hold a kernel to switch to with kexec on panic.
@@ -1462,7 +1465,7 @@ and is between 256 and 4096 characters. It is defined in the file
1462 1465
1463 reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode 1466 reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
1464 Format: <reboot_mode>[,<reboot_mode2>[,...]] 1467 Format: <reboot_mode>[,<reboot_mode2>[,...]]
1465 See arch/*/kernel/reboot.c or arch/*/kernel/process.c 1468 See arch/*/kernel/reboot.c or arch/*/kernel/process.c
1466 1469
1467 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area 1470 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area
1468 1471
@@ -1550,12 +1553,12 @@ and is between 256 and 4096 characters. It is defined in the file
1550 1553
1551 selinux_compat_net = 1554 selinux_compat_net =
1552 [SELINUX] Set initial selinux_compat_net flag value. 1555 [SELINUX] Set initial selinux_compat_net flag value.
1553 Format: { "0" | "1" } 1556 Format: { "0" | "1" }
1554 0 -- use new secmark-based packet controls 1557 0 -- use new secmark-based packet controls
1555 1 -- use legacy packet controls 1558 1 -- use legacy packet controls
1556 Default value is 0 (preferred). 1559 Default value is 0 (preferred).
1557 Value can be changed at runtime via 1560 Value can be changed at runtime via
1558 /selinux/compat_net. 1561 /selinux/compat_net.
1559 1562
1560 serialnumber [BUGS=X86-32] 1563 serialnumber [BUGS=X86-32]
1561 1564
@@ -1954,7 +1957,7 @@ and is between 256 and 4096 characters. It is defined in the file
1954 norandmaps Don't use address space randomization 1957 norandmaps Don't use address space randomization
1955 Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space 1958 Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space
1956 1959
1957 unwind_debug=N N > 0 will enable dwarf2 unwinder debugging 1960 unwind_debug=N N > 0 will enable dwarf2 unwinder debugging
1958 This is useful to get more information why 1961 This is useful to get more information why
1959 you got a "dwarf2 unwinder stuck" 1962 you got a "dwarf2 unwinder stuck"
1960 1963