aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-07-31 14:02:19 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-21 09:17:12 -0700
commit8b9b3bf4e79b8f41fa910932885526c2d1083af9 (patch)
tree13ccd050915a838b801c99aaf5a06a4a6c89bdc6 /arch/x86/kernel/cpu/Makefile
parent5faf9fc361bac926a2f9efe6018fdc16c0e7dad8 (diff)
downloadkernel_samsung_smdk4412-8b9b3bf4e79b8f41fa910932885526c2d1083af9.zip
kernel_samsung_smdk4412-8b9b3bf4e79b8f41fa910932885526c2d1083af9.tar.gz
kernel_samsung_smdk4412-8b9b3bf4e79b8f41fa910932885526c2d1083af9.tar.bz2
x86, random: Verify RDRAND functionality and allow it to be disabled
commit 49d859d78c5aeb998b6936fcb5f288f78d713489 upstream. If the CPU declares that RDRAND is available, go through a guranteed reseed sequence, and make sure that it is actually working (producing data.) If it does not, disable the CPU feature flag. Allow RDRAND to be disabled on the command line (as opposed to at compile time) for a user who has special requirements with regards to random numbers. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Matt Mackall <mpm@selenic.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/cpu/Makefile')
-rw-r--r--arch/x86/kernel/cpu/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 6042981..0e3a82a 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -15,6 +15,7 @@ CFLAGS_common.o := $(nostackp)
obj-y := intel_cacheinfo.o scattered.o topology.o
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o sched.o mshyperv.o
+obj-y += rdrand.o
obj-$(CONFIG_X86_32) += bugs.o
obj-$(CONFIG_X86_64) += bugs_64.o