From patchwork Thu Sep 8 13:57:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9321435 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79F0F60752 for ; Thu, 8 Sep 2016 13:58:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B0B029536 for ; Thu, 8 Sep 2016 13:58:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F8D0295C0; Thu, 8 Sep 2016 13:58:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5784629536 for ; Thu, 8 Sep 2016 13:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbcIHN6N (ORCPT ); Thu, 8 Sep 2016 09:58:13 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:59944 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754070AbcIHN6M (ORCPT ); Thu, 8 Sep 2016 09:58:12 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lh5vD-1bEgkB2NxX-00oZzj; Thu, 08 Sep 2016 15:56:48 +0200 From: Arnd Bergmann To: Andrew Morton Cc: Petr Mladek , Corentin Labbe , Herbert Xu , Stephen Rothwell , Arnd Bergmann , "David S. Miller" , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: engine: fix linux-next merge conflict Date: Thu, 8 Sep 2016 15:57:02 +0200 Message-Id: <20160908135724.1311726-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Wl+92H5yU/SyH10FhSHDGNAmJaATqne2Uc+5q26w8a2xdBCcYNL dgf2hOCVhVGGztjHliCYhDO8ysmCdCZ+bXyKeMpNgwvjqUDpNZETKvl+Z7fa5HDuuLhhC4z hAuSfjBlAiPdkhAnNQxpmUDyoDIA0hi1gK9XhWGZeDXYxDhREHuSEpXQf3lGxBvisHTtKcS lJVSARzWEZBX/F4k3yiDA== X-UI-Out-Filterresults: notjunk:1; V01:K0:hEXoS0m/3b0=:DremR/qn43GrhRENtmTQbA ZxZv89i9zsPhGm8dDqfszZcDQGfPOw9mSpJtslpofc9hV4mXkxgAZzZklUd3CI5iwLOtWmj7p QvUZCFhR1kL/fbLC31tPslrVwWwGtkZ9TuCs3ubT/K+h6pHFYw4B8pf50UgdHyIe8IPPCgBmk SnhLGcYxyx2N7erj+Z3sYujiVJ1UmArBw/wk7ailDmFNdmoH4XyIvXf35snoIc5veexp6KFlV 7aitfmuVCC9iglhQe5bDgIfOMlvk4qCKBmr5I6YAD1zD0PS2sCz/RQJePCEVuYw1QjyzDLGvu wqFBl+vEOBKwc36F+F8fCO2xkRTZMwZE6dQcUWBbYm2cH1Ghd9ATbTABnmd68COTElGm6dANo Usg7chMaWsqiKsGz3jamEUHfrnOBG1YODWID+c3De75rbNcrHPFvIYBqDFxoFffqo6AtJKgdM gmrxH4a7DoUTMEUwMDSduGyzN3aJPBo2w5vk3y66DzGXdBN3Pvi7wgHkkCE4YUD2niPc6opiS CnM1XK/9U81I/XQPBVWUGhoUbX9oIcsuex7HBoNp12BzX36/Q6UEUzAG7F29r9Te3R+i80J5C VpBZjF2fAIEAGQamcZkzlFgRqNG2RuQ5aOxXpiVBDpAMsbqQF47DDv68Xx+4atXp99w/OSaKu zTIbJXgGYuv1eOa2jTfsnjoMhgyjOAxqrZqeg4/6Qc2txL0TwVLu99LMVOY6VXUxP3XU= Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Arnd Bergmann Fixes: 4cba7cf025f3 ("crypto: engine - permit to enqueue ashash_request") Fixes: 8ca76638a2d0 ("kthread: kthread worker API cleanup") --- crypto/crypto_engine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/crypto_engine.c b/crypto/crypto_engine.c index 64fcd9ee3e2e..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; @@ -284,7 +284,7 @@ void crypto_finalize_cipher_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_cipher_request);