summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-05-11 20:25:20 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2014-05-11 20:25:20 -0700
commit7a5091d58419b4e5222abce58a40c072786ea1d6 (patch)
tree5539029ddca915b6c5d1e4e688e2943393c3f811 /Documentation
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c (diff)
downloadlinux-stable-7a5091d58419b4e5222abce58a40c072786ea1d6.tar.gz
linux-stable-7a5091d58419b4e5222abce58a40c072786ea1d6.tar.bz2
linux-stable-7a5091d58419b4e5222abce58a40c072786ea1d6.zip
x86, rdrand: When nordrand is specified, disable RDSEED as well
One can logically expect that when the user has specified "nordrand", the user doesn't want any use of the CPU random number generator, neither RDRAND nor RDSEED, so disable both. Reported-by: Stephan Mueller <smueller@chronox.de> Cc: Theodore Ts'o <tytso@mit.edu> Link: http://lkml.kernel.org/r/21542339.0lFnPSyGRS@myon.chronox.de Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 43842177b771..30a8ad0dae53 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2218,10 +2218,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
noreplace-smp [X86-32,SMP] Don't replace SMP instructions
with UP alternatives
- nordrand [X86] Disable the direct use of the RDRAND
- instruction even if it is supported by the
- processor. RDRAND is still available to user
- space applications.
+ nordrand [X86] Disable kernel use of the RDRAND and
+ RDSEED instructions even if they are supported
+ by the processor. RDRAND and RDSEED are still
+ available to user space applications.
noresume [SWSUSP] Disables resume and restores original swap
space.