Skip to content

Commit 189522d

Browse files
torvaldstorvalds
committed
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/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 ...
2 parents b61f7ff + d085eb8 commit 189522d

File tree

33 files changed

+128
-75
lines changed

33 files changed

+128
-75
lines changed

‎drivers/block/virtio_blk.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/blk-mq.h>
1616
#include <linux/blk-mq-virtio.h>
1717
#include <linux/numa.h>
18+
#include <uapi/linux/virtio_ring.h>
1819

1920
#define PART_BITS 4
2021
#define VQ_NAME_LEN 16

‎drivers/char/hw_random/virtio-rng.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/virtio.h>
1212
#include <linux/virtio_rng.h>
1313
#include <linux/module.h>
14+
#include <linux/slab.h>
1415

1516
static DEFINE_IDA(rng_index_ida);
1617

‎drivers/gpu/drm/virtio/virtgpu_ioctl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include <linux/file.h>
2929
#include <linux/sync_file.h>
30+
#include <linux/uaccess.h>
3031

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

‎drivers/gpu/drm/virtio/virtgpu_kms.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include <linux/virtio.h>
2727
#include <linux/virtio_config.h>
28+
#include <linux/virtio_ring.h>
2829

2930
#include <drm/drm_file.h>
3031

‎drivers/misc/mic/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ config MIC_COSM
116116

117117
config VOP
118118
tristate "VOP Driver"
119-
depends on VOP_BUS
119+
depends on VOP_BUS && VHOST_DPN
120120
select VHOST_RING
121121
select VIRTIO
122122
help

‎drivers/net/caif/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ config CAIF_HSI
5050

5151
config CAIF_VIRTIO
5252
tristate "CAIF virtio transport driver"
53-
depends on CAIF && HAS_DMA
53+
depends on CAIF && HAS_DMA && VHOST_DPN
5454
select VHOST_RING
5555
select VIRTIO
5656
select GENERIC_ALLOCATOR

‎drivers/remoteproc/remoteproc_sysfs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55

66
#include <linux/remoteproc.h>
7+
#include <linux/slab.h>
78

89
#include "remoteproc_internal.h"
910

‎drivers/remoteproc/stm32_rproc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/regmap.h>
2020
#include <linux/remoteproc.h>
2121
#include <linux/reset.h>
22+
#include <linux/slab.h>
2223
#include <linux/workqueue.h>
2324

2425
#include "remoteproc_internal.h"

‎drivers/rpmsg/mtk_rpmsg.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <linux/platform_device.h>
99
#include <linux/remoteproc.h>
1010
#include <linux/rpmsg/mtk_rpmsg.h>
11+
#include <linux/slab.h>
1112
#include <linux/workqueue.h>
1213

1314
#include "rpmsg_internal.h"

‎drivers/vdpa/Kconfig

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
config VDPA
3-
tristate
2+
menuconfig VDPA
3+
tristate "vDPA drivers"
44
help
55
Enable this module to support vDPA device that uses a
66
datapath which complies with virtio specifications with
77
vendor specific control path.
88

9-
menuconfig VDPA_MENU
10-
bool "VDPA drivers"
11-
default n
12-
13-
if VDPA_MENU
9+
if VDPA
1410

1511
config VDPA_SIM
1612
tristate "vDPA device simulator"
17-
depends on RUNTIME_TESTING_MENU
18-
select VDPA
13+
depends on RUNTIME_TESTING_MENU && HAS_DMA && VHOST_DPN
1914
select VHOST_RING
2015
default n
2116
help
@@ -24,14 +19,13 @@ config VDPA_SIM
2419
development of vDPA.
2520

2621
config IFCVF
27-
tristate "Intel IFC VF VDPA driver"
22+
tristate "Intel IFC VF vDPA driver"
2823
depends on PCI_MSI
29-
select VDPA
3024
default n
3125
help
3226
This kernel module can drive Intel IFC VF NIC to offload
3327
virtio dataplane traffic to hardware.
3428
To compile this driver as a module, choose M here: the module will
3529
be called ifcvf.
3630

37-
endif # VDPA_MENU
31+
endif # VDPA

0 commit comments

Comments
 (0)