diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 05:29:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 05:29:07 -0700 |
| commit | 8e6d539e0fd0c2124a20a207da70f2af7a9ae52c (patch) | |
| tree | 73016c1bdb5005125cdb5d60d48f73ab4300be64 /Documentation | |
| parent | 8237eb946a1a23c600fb289cf8dd3b399b10604e (diff) | |
| parent | 49d859d78c5aeb998b6936fcb5f288f78d713489 (diff) | |
| download | linux-3.10-8e6d539e0fd0c2124a20a207da70f2af7a9ae52c.tar.gz linux-3.10-8e6d539e0fd0c2124a20a207da70f2af7a9ae52c.tar.bz2 linux-3.10-8e6d539e0fd0c2124a20a207da70f2af7a9ae52c.zip | |
Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, random: Verify RDRAND functionality and allow it to be disabled
x86, random: Architectural inlines to get random integers with RDRAND
random: Add support for architectural random hooks
Fix up trivial conflicts in drivers/char/random.c: the architectural
random hooks touched "get_random_int()" that was simplified to use MD5
and not do the keyptr thing any more (see commit 6e5714eaf77d: "net:
Compute protocol sequence numbers and fragment IDs using MD5").
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 6afd091bc1f..93413ce9688 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1797,6 +1797,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. noresidual [PPC] Don't use residual data on PReP machines. + 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. + noresume [SWSUSP] Disables resume and restores original swap space. |