From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Dichtel Subject: [PATCH v9 08/11] cryptouser.h: fix include from userland Date: Thu, 2 Mar 2017 17:56:39 +0100 Message-ID: <1488473802-13354-9-git-send-email-nicolas.dichtel@6wind.com> References: <20170301045241.GB9156@gondor.apana.org.au> <1488473802-13354-1-git-send-email-nicolas.dichtel@6wind.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <1488473802-13354-1-git-send-email-nicolas.dichtel@6wind.com> Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: linux-rdma@vger.kernel.org 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/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 */ -- 2.8.1