Commit 189522da authored Apr 21, 2020 by Linus Torvalds

vhost

Pull virtio fixes and cleanups from Michael Tsirkin:

 - Some bug fixes

 - Cleanup a couple of issues that surfaced meanwhile

 - Disable vhost on ARM with OABI for now - to be fixed fully later in
   the cycle or in the next release.

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (24 commits)
  vhost: disable for OABI
  virtio: drop vringh.h dependency
  virtio_blk: add a missing include
  virtio-balloon: Avoid using the word 'report' when referring to free page hinting
  virtio-balloon: make virtballoon_free_page_report() static
  vdpa: fix comment of vdpa_register_device()
  vdpa: make vhost, virtio depend on menu
  vdpa: allow a 32 bit vq alignment
  drm/virtio: fix up for include file changes
  remoteproc: pull in slab.h
  rpmsg: pull in slab.h
  virtio_input: pull in slab.h
  remoteproc: pull in slab.h
  virtio-rng: pull in slab.h
  virtgpu: pull in uaccess.h
  tools/virtio: make asm/barrier.h self contained
  tools/virtio: define aligned attribute
  virtio/test: fix up after IOTLB changes
  vhost: Create accessors for virtqueues private_data
  vdpasim: Return status in vdpasim_get_status
  ...

parents b61f7ff0 d085eb8c

drivers/block/virtio_blk.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <linux/blk-mq.h>
		#include <linux/blk-mq-virtio.h>
		#include <linux/numa.h>
		#include <uapi/linux/virtio_ring.h>

		#define PART_BITS 4
		#define VQ_NAME_LEN 16

drivers/char/hw_random/virtio-rng.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		#include <linux/virtio.h>
		#include <linux/virtio_rng.h>
		#include <linux/module.h>
		#include <linux/slab.h>

		static DEFINE_IDA(rng_index_ida);

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@

		#include <linux/file.h>
		#include <linux/sync_file.h>
		#include <linux/uaccess.h>

		#include <drm/drm_file.h>
		#include <drm/virtgpu_drm.h>

drivers/gpu/drm/virtio/virtgpu_kms.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@

		#include <linux/virtio.h>
		#include <linux/virtio_config.h>
		#include <linux/virtio_ring.h>

		#include <drm/drm_file.h>

drivers/misc/mic/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ config MIC_COSM

		config VOP
		tristate "VOP Driver"
		depends on VOP_BUS
		depends on VOP_BUS && VHOST_DPN
		select VHOST_RING
		select VIRTIO
		help

Admin message