aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 12:36:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 12:36:50 -0400
commit5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch)
tree734289dc85074903d9e636a935d43414746e222c /Documentation/kernel-parameters.txt
parent5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff)
parent071361d3473ebb8142907470ff12d59c59f6be72 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small code cleanups" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits) mm: Convert print_symbol to %pSR gfs2: Convert print_symbol to %pSR m32r: Convert print_symbol to %pSR iostats.txt: add easy-to-find description for field 6 x86 cmpxchg.h: fix wrong comment treewide: Fix typo in printk and comments doc: devicetree: Fix various typos docbook: fix 8250 naming in device-drivers pata_pdc2027x: Fix compiler warning treewide: Fix typo in printks mei: Fix comments in drivers/misc/mei treewide: Fix typos in kernel messages pm44xx: Fix comment for "CONFIG_CPU_IDLE" doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP" mmzone: correct "pags" to "pages" in comment. kernel-parameters: remove outdated 'noresidual' parameter Remove spurious _H suffixes from ifdef comments sound: Remove stray pluses from Kconfig file radio-shark: Fix printk "CONFIG_LED_CLASS" doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE ...
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b801a332fb6f..8c01a0218a1e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1675,7 +1675,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
1675 module.sig_enforce 1675 module.sig_enforce
1676 [KNL] When CONFIG_MODULE_SIG is set, this means that 1676 [KNL] When CONFIG_MODULE_SIG is set, this means that
1677 modules without (valid) signatures will fail to load. 1677 modules without (valid) signatures will fail to load.
1678 Note that if CONFIG_MODULE_SIG_ENFORCE is set, that 1678 Note that if CONFIG_MODULE_SIG_FORCE is set, that
1679 is always true, so this option does nothing. 1679 is always true, so this option does nothing.
1680 1680
1681 mousedev.tap_time= 1681 mousedev.tap_time=
@@ -2024,8 +2024,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2024 noreplace-smp [X86-32,SMP] Don't replace SMP instructions 2024 noreplace-smp [X86-32,SMP] Don't replace SMP instructions
2025 with UP alternatives 2025 with UP alternatives
2026 2026
2027 noresidual [PPC] Don't use residual data on PReP machines.
2028
2029 nordrand [X86] Disable the direct use of the RDRAND 2027 nordrand [X86] Disable the direct use of the RDRAND
2030 instruction even if it is supported by the 2028 instruction even if it is supported by the
2031 processor. RDRAND is still available to user 2029 processor. RDRAND is still available to user