From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751508AbZG1UF6 (ORCPT ); Tue, 28 Jul 2009 16:05:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751095AbZG1UF6 (ORCPT ); Tue, 28 Jul 2009 16:05:58 -0400 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 From: Jiri Slaby To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, Andrew Morton , Christoph Hellwig , linux-kernel@vger.kernel.org, Sam Ravnborg , 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> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <20090728195431.GA20914@merkur.ravnborg.org> References: <20090728195431.GA20914@merkur.ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid userspace build failures such as: .../linux/uio.h:37: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘iov_length’ .../linux/uio.h:47: error: expected declaration specifiers or ‘...’ before ‘size_t’ 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) */ }; -#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 +#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 *iov, unsigned long nr_segs) } unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to); +#endif #endif -- 1.6.3.3