Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 812ed032 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

uio: mark uio.h functions __KERNEL__ only 



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: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8da14b5f

include/linux/uio.h

+8 −9
Original line number Diff line number Diff line
@@ -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