diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-05 10:59:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-05 10:59:18 -0700 |
commit | 31c0aa87ec8a30b1e9e4cf862905a369560f7705 (patch) | |
tree | 0bdbff8a5adf82925fff819bd1d12a9696387a49 /drivers/char/Kconfig | |
parent | 9c94b39560c3a013de5886ea21ef1eaf21840cb9 (diff) | |
parent | ab9a7e27044b87ff2be47b8f8e095400e7fccc44 (diff) |
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull /dev/random updates from Ted Ts'o:
- Improve getrandom and /dev/random's support for those arm64
architecture variants that have RNG instructions.
- Use batched output from CRNG instead of CPU's RNG instructions for
better performance.
- Miscellaneous bug fixes.
* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
random: avoid warnings for !CONFIG_NUMA builds
random: fix data races at timer_rand_state
random: always use batched entropy for get_random_u{32,64}
random: Make RANDOM_TRUST_CPU depend on ARCH_RANDOM
arm64: add credited/trusted RNG support
random: add arch_get_random_*long_early()
random: split primary/secondary crng init paths
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r-- | drivers/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index fea084e0909b..d4665fe9ccd2 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -474,7 +474,7 @@ endmenu config RANDOM_TRUST_CPU bool "Trust the CPU manufacturer to initialize Linux's CRNG" - depends on X86 || S390 || PPC + depends on ARCH_RANDOM default n help Assume that CPU manufacturer (e.g., Intel or AMD for RDSEED or |