diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-24 11:39:37 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-24 11:39:37 -0500 |
| commit | 16acbf31cc366a630b0a082f470e0bfa52b9e102 (patch) | |
| tree | 67c0f5764fe02da8d0879c44b77b2f19fcf6ffab | |
| parent | feb9306e7365d64479c328eb9afa0c9b389521fe (diff) | |
| download | longterm-queue-2.6.34-16acbf31cc366a630b0a082f470e0bfa52b9e102.tar.gz | |
fix unmapped name in RDRAND backport
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/x86-random-make-ARCH_RANDOM-prompt-if-EMBEDDED-not-E.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/queue/series b/queue/series index e69de29..48c5bac 100644 --- a/queue/series +++ b/queue/series @@ -0,0 +1 @@ +x86-random-make-ARCH_RANDOM-prompt-if-EMBEDDED-not-E.patch diff --git a/queue/x86-random-make-ARCH_RANDOM-prompt-if-EMBEDDED-not-E.patch b/queue/x86-random-make-ARCH_RANDOM-prompt-if-EMBEDDED-not-E.patch new file mode 100644 index 0000000..214af2c --- /dev/null +++ b/queue/x86-random-make-ARCH_RANDOM-prompt-if-EMBEDDED-not-E.patch @@ -0,0 +1,29 @@ +From 30ad8f68221780d6da6e821661efa00ede08271a Mon Sep 17 00:00:00 2001 +From: Romain Francoise <romain@orebokech.com> +Date: Thu, 24 Jan 2013 11:35:42 -0500 +Subject: [PATCH] x86, random: make ARCH_RANDOM prompt if EMBEDDED, not EXPERT + +Before v2.6.38 CONFIG_EXPERT was known as CONFIG_EMBEDDED but the +Kconfig entry was not changed to match when upstream commit +628c6246d47b85f5357298601df2444d7f4dd3fd ("x86, random: Architectural +inlines to get random integers with RDRAND") was backported. + +Signed-off-by: Romain Francoise <romain@orebokech.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index 0a813f8..b87027b 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -1462,7 +1462,7 @@ config ARCH_USES_PG_UNCACHED + + config ARCH_RANDOM + def_bool y +- prompt "x86 architectural random number generator" if EXPERT ++ prompt "x86 architectural random number generator" if EMBEDDED + ---help--- + Enable the x86 architectural RDRAND instruction + (Intel Bull Mountain technology) to generate random numbers. +-- +1.7.12.1 + |