diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 16:29:07 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 16:29:07 +0400 |
commit | 8e6d539e0fd0c2124a20a207da70f2af7a9ae52c (patch) | |
tree | 73016c1bdb5005125cdb5d60d48f73ab4300be64 /arch/x86/Kconfig | |
parent | 8237eb946a1a23c600fb289cf8dd3b399b10604e (diff) | |
parent | 49d859d78c5aeb998b6936fcb5f288f78d713489 (diff) | |
download | linux-8e6d539e0fd0c2124a20a207da70f2af7a9ae52c.tar.xz |
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 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 16db864c42b7..77f7a384c0b5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1454,6 +1454,15 @@ config ARCH_USES_PG_UNCACHED def_bool y depends on X86_PAT +config ARCH_RANDOM + def_bool y + prompt "x86 architectural random number generator" if EXPERT + ---help--- + Enable the x86 architectural RDRAND instruction + (Intel Bull Mountain technology) to generate random numbers. + If supported, this is a high bandwidth, cryptographically + secure hardware random number generator. + config EFI bool "EFI runtime service support" depends on ACPI |