From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Slaby Subject: [PATCH v3 1/1] UIO: mark uio.h functions __KERNEL__ only Date: Tue, 28 Jul 2009 22:05:55 +0200 Message-ID: <1248811555-6648-1-git-send-email-jirislaby@gmail.com> References: <20090728195431.GA20914@merkur.ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-fsdevel@vger.kernel.org, Andrew Morton , Christoph Hellwig , linux-kernel@vger.kernel.org, Sam Ravnborg , Jiri Slaby To: Alexander Viro Return-path: Received: from server1.wserver.cz ([82.113.45.157]:33620 "EHLO server1.wserver.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750695AbZG1UF5 (ORCPT ); Tue, 28 Jul 2009 16:05:57 -0400 In-Reply-To: <20090728195431.GA20914@merkur.ravnborg.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: To avoid userspace build failures such as: =2E../linux/uio.h:37: error: expected =E2=80=98=3D=E2=80=99, =E2=80=98,= =E2=80=99, =E2=80=98;=E2=80=99, =E2=80=98asm=E2=80=99 or =E2=80=98__att= ribute__=E2=80=99 before =E2=80=98iov_length=E2=80=99 =2E../linux/uio.h:47: error: expected declaration specifiers or =E2=80=98= =2E..=E2=80=99 before =E2=80=98size_t=E2=80=99 move uio functions inside a __KERNEL__ block. Signed-off-by: Jiri Slaby --- include/linux/uio.h | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index b7fe138..98c1143 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -19,15 +19,6 @@ struct iovec __kernel_size_t iov_len; /* Must be size_t (1003.1g) */ }; =20 -#ifdef __KERNEL__ - -struct kvec { - void *iov_base; /* and that should *never* hold a userland pointer */ - size_t iov_len; -}; - -#endif - /* * UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1) */ @@ -35,6 +26,13 @@ struct kvec { #define UIO_FASTIOV 8 #define UIO_MAXIOV 1024 =20 +#ifdef __KERNEL__ + +struct kvec { + void *iov_base; /* and that should *never* hold a userland pointer */ + size_t iov_len; +}; + /* * Total number of bytes covered by an iovec. * @@ -53,5 +51,6 @@ static inline size_t iov_length(const struct iovec *i= ov, unsigned long nr_segs) } =20 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, si= ze_t to); +#endif =20 #endif --=20 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel= " in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html