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 6e5714ea: "net: Compute protocol sequence numbers and fragment IDs using MD5").
Showing
- Documentation/kernel-parameters.txt 5 additions, 0 deletionsDocumentation/kernel-parameters.txt
- arch/x86/Kconfig 9 additions, 0 deletionsarch/x86/Kconfig
- arch/x86/include/asm/archrandom.h 75 additions, 0 deletionsarch/x86/include/asm/archrandom.h
- arch/x86/kernel/cpu/Makefile 1 addition, 0 deletionsarch/x86/kernel/cpu/Makefile
- arch/x86/kernel/cpu/common.c 2 additions, 0 deletionsarch/x86/kernel/cpu/common.c
- arch/x86/kernel/cpu/rdrand.c 73 additions, 0 deletionsarch/x86/kernel/cpu/rdrand.c
- drivers/char/random.c 21 additions, 2 deletionsdrivers/char/random.c
- include/linux/random.h 13 additions, 0 deletionsinclude/linux/random.h
Loading
Please register or sign in to comment