Merge branch 'master' into openslxopenslx

1 files changed, 1 insertions, 15 deletions

diff --git a/src/include/ipxe/posix_io.h b/src/include/ipxe/posix_io.h
index 1a73b5e86..693e0ae34 100644
--- a/src/include/ipxe/posix_io.h
+++ b/src/include/ipxe/posix_io.h
@@ -10,7 +10,6 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
-#include <ipxe/uaccess.h>
 
 /** Minimum file descriptor that will ever be allocated */
 #define POSIX_FD_MIN ( 1 )
@@ -22,8 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 typedef uint32_t fd_set;
 
 extern int open ( const char *uri_string );
-extern ssize_t read_user ( int fd, userptr_t buffer,
-			   off_t offset, size_t len );
+extern ssize_t read ( int fd, void *buf, size_t len );
 extern int select ( fd_set *readfds, int wait );
 extern ssize_t fsize ( int fd );
 extern int close ( int fd );
@@ -72,16 +70,4 @@ FD_ISSET ( int fd, fd_set *set ) {
 	return ( *set & ( 1 << fd ) );
 }
 
-/**
- * Read data from file
- *
- * @v fd		File descriptor
- * @v buf		Data buffer
- * @v len		Maximum length to read
- * @ret len		Actual length read, or negative error number
- */
-static inline ssize_t read ( int fd, void *buf, size_t len ) {
-	return read_user ( fd, virt_to_user ( buf ), 0, len );
-}
-
 #endif /* _IPXE_POSIX_IO_H */