From patchwork Tue Feb 28 20:47:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 9596917 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 5B75960453 for ; Tue, 28 Feb 2017 21:26:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E5D928576 for ; Tue, 28 Feb 2017 21:26:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4335028593; Tue, 28 Feb 2017 21:26:23 +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 E27D828599 for ; Tue, 28 Feb 2017 21:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752151AbdB1VZD (ORCPT ); Tue, 28 Feb 2017 16:25:03 -0500 Received: from host.76.145.23.62.rev.coltfrance.com ([62.23.145.76]:34186 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751640AbdB1VYN (ORCPT ); Tue, 28 Feb 2017 16:24:13 -0500 Received: from elsass.dev.6wind.com (unknown [10.16.0.149]) by proxy.6wind.com (Postfix) with ESMTPS id B979A29030; Tue, 28 Feb 2017 21:47:59 +0100 (CET) Received: from root by elsass.dev.6wind.com with local (Exim 4.84_2) (envelope-from ) id 1ciogd-0005DZ-0J; Tue, 28 Feb 2017 21:47:55 +0100 From: Nicolas Dichtel To: arnd@arndb.de, mmarek@suse.com Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, airlied@linux.ie, davem@davemloft.net, linux@armlinux.org.uk, bp@alien8.de, slash.tmp@free.fr, daniel.vetter@ffwll.ch, rmk+kernel@armlinux.org.uk, msalter@redhat.com, jengelh@inai.de, hch@infradead.org, tklauser@distanz.ch, mpe@ellerman.id.au, mingo@kernel.org, tglx@linutronix.de, ldv@altlinux.org, nicolas.dichtel@6wind.com, herbert@gondor.apana.org.au, linux-rdma@vger.kernel.org Subject: [PATCH v8 08/11] cryptouser.h: fix include from userland Date: Tue, 28 Feb 2017 21:47:34 +0100 Message-Id: <1488314857-28327-9-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1488314857-28327-1-git-send-email-nicolas.dichtel@6wind.com> References: <20170228024844.GA28691@altlinux.org> <1488314857-28327-1-git-send-email-nicolas.dichtel@6wind.com> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch prepares the uapi export by fixing the following error: .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) char cru_name[CRYPTO_MAX_ALG_NAME]; Signed-off-by: Nicolas Dichtel --- include/linux/crypto.h | 2 +- include/uapi/linux/cryptouser.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/crypto.h b/include/linux/crypto.h index c0b0cf3d2d2f..4cf29a35bb4b 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -24,6 +24,7 @@ #include #include #include +#include /* * Autoloaded crypto modules should only use a prefixed name to avoid allowing @@ -123,7 +124,6 @@ /* * Miscellaneous stuff. */ -#define CRYPTO_MAX_ALG_NAME 64 /* * The macro CRYPTO_MINALIGN_ATTR (along with the void * type in the actual diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index c6a09c5261e7..05fcf1393b4d 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,9 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _UAPI_CRYPTOUSER_H +#define _UAPI_CRYPTOUSER_H + #include /* Netlink configuration messages. */ @@ -54,6 +57,8 @@ enum crypto_attr_type_t { #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1) }; +#define CRYPTO_MAX_ALG_NAME 64 + struct crypto_user_alg { char cru_name[CRYPTO_MAX_ALG_NAME]; char cru_driver_name[CRYPTO_MAX_ALG_NAME]; @@ -121,3 +126,5 @@ struct crypto_report_acomp { #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ sizeof(struct crypto_report_blkcipher)) + +#endif /* _UAPI_CRYPTOUSER_H */