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

Commit 94f1be97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull virtio fixes from Rusty Russell:
 "A build fix and a uapi exposure fix.  The build fix is later than I
  liked, but my first version broke linux-next due to overzealous header
  clean."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio_console: fix uapi header
  Hoist memcpy_fromiovec/memcpy_toiovec into lib/
parents 519fe2ec 6407d75a

drivers/misc/vmw_vmci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


config VMWARE_VMCI

	tristate "VMware VMCI Driver"

	depends on X86 && PCI && NET

	depends on X86 && PCI

	help

	  This is VMware's Virtual Machine Communication Interface.  It enables

	  high-speed communication between host and guest in a virtual

drivers/misc/vmw_vmci/vmci_queue_pair.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/pagemap.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/socket.h>

#include <linux/uio.h>

#include <linux/wait.h>

#include <linux/vmalloc.h>

include/linux/socket.h

+0 −2
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ struct ucred { 


extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred);



extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);

extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,

			       int offset, int len);

extern int csum_partial_copy_fromiovecend(unsigned char *kdata,
@@ -314,7 +313,6 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata, 
					  unsigned int len, __wsum *csump);



extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *address, int mode);

extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len);

extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata,

			     int offset, int len);

extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr);

include/linux/uio.h

+3 −0
Original line number Diff line number Diff line
@@ -35,4 +35,7 @@ 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);



int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);

int memcpy_toiovec(struct iovec *iov, unsigned char *kdata, int len);

#endif

include/uapi/linux/virtio_console.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define VIRTIO_CONSOLE_F_SIZE	0	/* Does host provide console size? */

#define VIRTIO_CONSOLE_F_MULTIPORT 1	/* Does host provide multiple ports? */



#define VIRTIO_CONSOLE_BAD_ID		(~(u32)0)

#define VIRTIO_CONSOLE_BAD_ID		(~(__u32)0)



struct virtio_console_config {

	/* colums of the screens */