summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide/kernel-parameters.txt
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-09-25 11:30:47 -0700
committerOlof Johansson <olof@lixom.net>2018-09-25 11:30:47 -0700
commitcdddeefc39cc26b2d429f8f7ea3c35bf8cb8c6a1 (patch)
tree2628d4922d0675df5659439f22f5ebda9c4b302a /Documentation/admin-guide/kernel-parameters.txt
parentbf1da406909b13903873d1f91346f99303fd8cb3 (diff)
parent11da3a7f84f19c26da6f86af878298694ede0804 (diff)
downloadlwn-cdddeefc39cc26b2d429f8f7ea3c35bf8cb8c6a1.tar.gz
lwn-cdddeefc39cc26b2d429f8f7ea3c35bf8cb8c6a1.zip
Merge tag 'v4.19-rc3' into next/drivers
Linux 4.19-rc3
Diffstat (limited to 'Documentation/admin-guide/kernel-parameters.txt')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 9871e649ffef..64a3bf54b974 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3523,6 +3523,12 @@
ramdisk_size= [RAM] Sizes of RAM disks in kilobytes
See Documentation/blockdev/ramdisk.txt.
+ random.trust_cpu={on,off}
+ [KNL] Enable or disable trusting the use of the
+ CPU's random number generator (if available) to
+ fully seed the kernel's CRNG. Default is controlled
+ by CONFIG_RANDOM_TRUST_CPU.
+
ras=option[,option,...] [KNL] RAS-specific options
cec_disable [X86]