From patchwork Tue Mar 14 12:54:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 9623179 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 0C93760522 for ; Tue, 14 Mar 2017 12:56:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F35C22815E for ; Tue, 14 Mar 2017 12:56:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7CFF2854F; Tue, 14 Mar 2017 12:56:37 +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=unavailable 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 38B0E28541 for ; Tue, 14 Mar 2017 12:56:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750996AbdCNM4X (ORCPT ); Tue, 14 Mar 2017 08:56:23 -0400 Received: from host.76.145.23.62.rev.coltfrance.com ([62.23.145.76]:47480 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751229AbdCNMzS (ORCPT ); Tue, 14 Mar 2017 08:55:18 -0400 Received: from elsass.dev.6wind.com (unknown [10.16.0.149]) by proxy.6wind.com (Postfix) with ESMTPS id A0AD62739C; Tue, 14 Mar 2017 13:55:04 +0100 (CET) Received: from root by elsass.dev.6wind.com with local (Exim 4.84_2) (envelope-from ) id 1cnlyd-00040u-F7; Tue, 14 Mar 2017 13:54:59 +0100 From: Nicolas Dichtel To: yamada.masahiro@socionext.com Cc: arnd@arndb.de, mmarek@suse.com, 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 v10 08/11] cryptouser.h: fix include from userland Date: Tue, 14 Mar 2017 13:54:50 +0100 Message-Id: <1489496093-15315-9-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1489496093-15315-1-git-send-email-nicolas.dichtel@6wind.com> References: <1489496093-15315-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 Acked-by: Herbert Xu --- include/linux/crypto.h | 2 +- include/uapi/linux/crypto.h | 14 ++++++++++++++ include/uapi/linux/cryptouser.h | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/crypto.h diff --git a/include/linux/crypto.h b/include/linux/crypto.h index c0b0cf3d2d2f..cc2425ba8527 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/crypto.h b/include/uapi/linux/crypto.h new file mode 100644 index 000000000000..e342c5a5ac50 --- /dev/null +++ b/include/uapi/linux/crypto.h @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2017 Nicolas Dichtel + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + */ + +#ifndef _UAPI_CRYPTO_H +#define _UAPI_CRYPTO_H + +#define CRYPTO_MAX_ALG_NAME 64 + +#endif /* _UAPI_CRYPTO_H */ diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index c6a09c5261e7..ce3c64fb89e1 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,7 +18,11 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _UAPI_CRYPTOUSER_H +#define _UAPI_CRYPTOUSER_H + #include +#include /* Netlink configuration messages. */ enum { @@ -121,3 +125,5 @@ struct crypto_report_acomp { #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ sizeof(struct crypto_report_blkcipher)) + +#endif /* _UAPI_CRYPTOUSER_H */