From: Arnd Bergmann Date: Sat, 10 Sep 2016 10:36:35 +0000 (+1000) Subject: crypto: engine: fix linux-next merge conflict X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=e85da17e84787605e1944bcf13254a8a94e006da crypto: engine: fix linux-next merge conflict A merge conflict between the akpm-current tree and the crypto tree caused a build failure in ARM allmodconfig today: crypto/crypto_engine.c: In function 'crypto_transfer_hash_request': crypto/crypto_engine.c:234:3: error: implicit declaration of function 'queue_kthread_work' [-Werror=implicit-function-declaration] This adapts the crypto code to the API change. Fixes: 4cba7cf025f3 ("crypto: engine - permit to enqueue ashash_request") Fixes: 8ca76638a2d0 ("kthread: kthread worker API cleanup") Link: http://lkml.kernel.org/r/20160908135724.1311726-1-arnd@arndb.de Signed-off-by: Arnd Bergmann Cc: Petr Mladek Cc: Stephen Rothwell Signed-off-by: Andrew Morton --- diff --git a/crypto/crypto_engine.c b/crypto/crypto_engine.c index e3db9fc75be7..6989ba0046df 100644 --- a/crypto/crypto_engine.c +++ b/crypto/crypto_engine.c @@ -231,7 +231,7 @@ int crypto_transfer_hash_request(struct crypto_engine *engine, ret = ahash_enqueue_request(&engine->queue, req); if (!engine->busy && need_pump) - queue_kthread_work(&engine->kworker, &engine->pump_requests); + kthread_queue_work(&engine->kworker, &engine->pump_requests); spin_unlock_irqrestore(&engine->queue_lock, flags); return ret; @@ -321,7 +321,7 @@ void crypto_finalize_hash_request(struct crypto_engine *engine, req->base.complete(&req->base, err); - queue_kthread_work(&engine->kworker, &engine->pump_requests); + kthread_queue_work(&engine->kworker, &engine->pump_requests); } EXPORT_SYMBOL_GPL(crypto_finalize_hash_request);