aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2014-01-21 10:10:58 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-01-21 15:35:11 +0100
commitb520abe9a63d4a36cbde707e7c17119b28e5af01 (patch)
tree550ad35cf4bc731b48a207999c401fb73a6da062
parentf975a1a4738ace6344108a28a92767b95d6cef89 (diff)
downloadbuildroot-b520abe9a63d4a36cbde707e7c17119b28e5af01.tar.gz
buildroot-b520abe9a63d4a36cbde707e7c17119b28e5af01.tar.bz2
cryptodev-linux: add fix for kernels >=3.13
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/cryptodev-linux/cryptodev-linux-01-Replace_INIT_COMPLETION_with_reinit_completion.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/package/cryptodev-linux/cryptodev-linux-01-Replace_INIT_COMPLETION_with_reinit_completion.patch b/package/cryptodev-linux/cryptodev-linux-01-Replace_INIT_COMPLETION_with_reinit_completion.patch
new file mode 100644
index 0000000000..3c1b5801f5
--- /dev/null
+++ b/package/cryptodev-linux/cryptodev-linux-01-Replace_INIT_COMPLETION_with_reinit_completion.patch
@@ -0,0 +1,83 @@
+From: Cosmin Paraschiv <cosmin.paraschiv@freescale.com>
+To: <cryptodev-linux-devel@gna.org>
+Subject: [Cryptodev-linux-devel] [PATCH v2] Replace INIT_COMPLETION with
+ reinit_completion.
+
+In the 3.13-rc1 Linux kernel, the INIT_COMPLETION macro has been replaced
+with an inline function, reinit_completion [1][2]. We are currently
+using the 3.13-rc3 Linux kernel, which leads to the following error:
+
+cryptlib.c:279:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration]
+ INIT_COMPLETION(cdata->async.result->completion);
+
+[1] https://github.com/torvalds/linux/commit/c32f74ab2872994bc8336ed367313da3139350ca
+[2] https://github.com/torvalds/linux/commit/62026aedaacedbe1ffe94a3599ad4acd8ecdf587
+
+Signed-off-by: Cosmin Paraschiv <cosmin.paraschiv@freescale.com>
+Reviewed-by: Cristian Stoica <cristian.stoica@freescale.com>
+Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
+Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
+---
+ cryptlib.c | 8 ++++----
+ cryptodev_int.h | 6 ++++++
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/cryptlib.c b/cryptlib.c
+index e6c91fc..fe25563 100644
+--- a/cryptlib.c
++++ b/cryptlib.c
+@@ -276,7 +276,7 @@ ssize_t cryptodev_cipher_encrypt(struct cipher_data *cdata,
+ {
+ int ret;
+
+- INIT_COMPLETION(cdata->async.result->completion);
++ reinit_completion(&cdata->async.result->completion);
+
+ if (cdata->aead == 0) {
+ ablkcipher_request_set_crypt(cdata->async.request,
+@@ -299,7 +299,7 @@ ssize_t cryptodev_cipher_decrypt(struct cipher_data *cdata,
+ {
+ int ret;
+
+- INIT_COMPLETION(cdata->async.result->completion);
++ reinit_completion(&cdata->async.result->completion);
+ if (cdata->aead == 0) {
+ ablkcipher_request_set_crypt(cdata->async.request,
+ (struct scatterlist *)src, dst,
+@@ -410,7 +410,7 @@ ssize_t cryptodev_hash_update(struct hash_data *hdata,
+ {
+ int ret;
+
+- INIT_COMPLETION(hdata->async.result->completion);
++ reinit_completion(&hdata->async.result->completion);
+ ahash_request_set_crypt(hdata->async.request, sg, NULL, len);
+
+ ret = crypto_ahash_update(hdata->async.request);
+@@ -422,7 +422,7 @@ int cryptodev_hash_final(struct hash_data *hdata, void* output)
+ {
+ int ret;
+
+- INIT_COMPLETION(hdata->async.result->completion);
++ reinit_completion(&hdata->async.result->completion);
+ ahash_request_set_crypt(hdata->async.request, NULL, output, 0);
+
+ ret = crypto_ahash_final(hdata->async.request);
+diff --git a/cryptodev_int.h b/cryptodev_int.h
+index eb2aabf..3834ef1 100644
+--- a/cryptodev_int.h
++++ b/cryptodev_int.h
+@@ -2,6 +2,12 @@
+ #ifndef CRYPTODEV_INT_H
+ # define CRYPTODEV_INT_H
+
++#include <linux/version.h>
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0))
++# define reinit_completion(x) INIT_COMPLETION(*(x))
++#endif
++
+ #include <linux/init.h>
+ #include <linux/sched.h>
+ #include <linux/fs.h>
+--
+1.8.3.1