2011-05-17 18:52:45

by Randy Dunlap

Subject: [PATCH -next] crypto: fix aesni build on i386

From: Randy Dunlap <[email protected]>

Fix build error on i386 by moving function prototypes:

arch/x86/crypto/aesni-intel_glue.c: In function 'aesni_init':
arch/x86/crypto/aesni-intel_glue.c:1263: error: implicit declaration of function 'crypto_fpu_init'
arch/x86/crypto/aesni-intel_glue.c: In function 'aesni_exit':
arch/x86/crypto/aesni-intel_glue.c:1373: error: implicit declaration of function 'crypto_fpu_exit'

Signed-off-by: Randy Dunlap <[email protected]>
---
arch/x86/crypto/aesni-intel_glue.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

These function prototypes should preferably be in a header file somewhere.

--- linux-next-20110517.orig/arch/x86/crypto/aesni-intel_glue.c
+++ linux-next-20110517/arch/x86/crypto/aesni-intel_glue.c
@@ -94,6 +94,10 @@ asmlinkage void aesni_cbc_enc(struct cry
const u8 *in, unsigned int len, u8 *iv);
asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out,
const u8 *in, unsigned int len, u8 *iv);
+
+int crypto_fpu_init(void);
+void crypto_fpu_exit(void);
+
#ifdef CONFIG_X86_64
asmlinkage void aesni_ctr_enc(struct crypto_aes_ctx *ctx, u8 *out,
const u8 *in, unsigned int len, u8 *iv);
@@ -140,9 +144,6 @@ asmlinkage void aesni_gcm_dec(void *ctx,
u8 *hash_subkey, const u8 *aad, unsigned long aad_len,
u8 *auth_tag, unsigned long auth_tag_len);

-int crypto_fpu_init(void);
-void crypto_fpu_exit(void);
-
static inline struct
aesni_rfc4106_gcm_ctx *aesni_rfc4106_gcm_ctx_get(struct crypto_aead *tfm)
{

2011-05-17 23:03:44

by Herbert Xu

Subject: Re: [PATCH -next] crypto: fix aesni build on i386

On Tue, May 17, 2011 at 11:52:45AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix build error on i386 by moving function prototypes:
>
> arch/x86/crypto/aesni-intel_glue.c: In function 'aesni_init':
> arch/x86/crypto/aesni-intel_glue.c:1263: error: implicit declaration of function 'crypto_fpu_init'
> arch/x86/crypto/aesni-intel_glue.c: In function 'aesni_exit':
> arch/x86/crypto/aesni-intel_glue.c:1373: error: implicit declaration of function 'crypto_fpu_exit'
>
> Signed-off-by: Randy Dunlap <[email protected]>

Applied. Thanks Randy!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt