aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2005-05-01 11:58:54 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 11:58:54 -0400
commitc45166be3cc666ce88fe623ad79276c943e74eff (patch)
treedb59fdfb6834c112c99a5ab8692fe8372d7961ba /crypto
parentb05d85a87d9711f5f5f2eb05c79038d5d5ff1f44 (diff)
[PATCH] uml: support AES i586 crypto driver
We want to make possible, for the user, to enable the i586 AES implementation. This requires a restructure. - Add a CONFIG_UML_X86 to notify that we are building a UML for i386. - Rename CONFIG_64_BIT to CONFIG_64BIT as is used for all other archs - Tell crypto/Kconfig that UML_X86 is as good as X86 - Tell it that it must exclude not X86_64 but 64BIT, which will give the same results. - Tell kbuild to descend down into arch/i386/crypto/ to build what's needed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 536754faf4d2..90d6089d60ed 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -146,7 +146,7 @@ config CRYPTO_SERPENT
146 146
147config CRYPTO_AES 147config CRYPTO_AES
148 tristate "AES cipher algorithms" 148 tristate "AES cipher algorithms"
149 depends on CRYPTO && !(X86 && !X86_64) 149 depends on CRYPTO && !((X86 || UML_X86) && !64BIT)
150 help 150 help
151 AES cipher algorithms (FIPS-197). AES uses the Rijndael 151 AES cipher algorithms (FIPS-197). AES uses the Rijndael
152 algorithm. 152 algorithm.
@@ -166,7 +166,7 @@ config CRYPTO_AES
166 166
167config CRYPTO_AES_586 167config CRYPTO_AES_586
168 tristate "AES cipher algorithms (i586)" 168 tristate "AES cipher algorithms (i586)"
169 depends on CRYPTO && (X86 && !X86_64) 169 depends on CRYPTO && ((X86 || UML_X86) && !64BIT)
170 help 170 help
171 AES cipher algorithms (FIPS-197). AES uses the Rijndael 171 AES cipher algorithms (FIPS-197). AES uses the Rijndael
172 algorithm. 172 algorithm.