From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751913AbeCVT6a (ORCPT ); Thu, 22 Mar 2018 15:58:30 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:36354 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbeCVT61 (ORCPT ); Thu, 22 Mar 2018 15:58:27 -0400 From: Matthew Wilcox To: linux-mm@kvack.org Cc: Kirill Tkhai , Matthew Wilcox , linux-kernel@vger.kernel.org, "Paul E. McKenney" Subject: [PATCH 2/4] Rename 'free' functions Date: Thu, 22 Mar 2018 12:58:17 -0700 Message-Id: <20180322195819.24271-3-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180322195819.24271-1-willy@infradead.org> References: <20180322195819.24271-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox The names of these static functions collide with a kernel-wide 'free' function. Call them 'free_inst' instead. Signed-off-by: Matthew Wilcox --- crypto/lrw.c | 4 ++-- crypto/xts.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/lrw.c b/crypto/lrw.c index cbbd7c50ad19..2b93fc7f4e38 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -522,7 +522,7 @@ static void exit_tfm(struct crypto_skcipher *tfm) crypto_free_skcipher(ctx->child); } -static void free(struct skcipher_instance *inst) +static void free_inst(struct skcipher_instance *inst) { crypto_drop_skcipher(skcipher_instance_ctx(inst)); kfree(inst); @@ -634,7 +634,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.encrypt = encrypt; inst->alg.decrypt = decrypt; - inst->free = free; + inst->free = free_inst; err = skcipher_register_instance(tmpl, inst); if (err) diff --git a/crypto/xts.c b/crypto/xts.c index f317c48b5e43..5a7ac3dc2fd7 100644 --- a/crypto/xts.c +++ b/crypto/xts.c @@ -465,7 +465,7 @@ static void exit_tfm(struct crypto_skcipher *tfm) crypto_free_cipher(ctx->tweak); } -static void free(struct skcipher_instance *inst) +static void free_inst(struct skcipher_instance *inst) { crypto_drop_skcipher(skcipher_instance_ctx(inst)); kfree(inst); @@ -576,7 +576,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.encrypt = encrypt; inst->alg.decrypt = decrypt; - inst->free = free; + inst->free = free_inst; err = skcipher_register_instance(tmpl, inst); if (err) -- 2.16.2