History

Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger: - Support for VMAP_STACK - Support for splice_write in hostfs - Fixes for virt-pci - Fixes for virtio_uml - Various fixes * tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: fix stub location calculation um: virt-pci: fix uapi documentation um: enable VMAP_STACK um: virt-pci: don't do DMA from stack hostfs: support splice_write um: virtio_uml: fix memory leak on init failures um: virtio_uml: include linux/virtio-uml.h lib/logic_iomem: fix sparse warnings um: make PCI emulation driver init/exit static

Linus Torvalds committed 5 years ago

Commit d6c338a2 parents 35776f1 adf9ae010 files · +124 −42Browse files

Showing the changes to include/uapi/linux (1 of 10 files). Show all

Unified · Split

include/uapi/linux/virtio_pcidev.h+3−2
@@ -9,13 +9,14 @@ · 8 unmodified lines
9 9
10/**10/**
11 * enum virtio_pcidev_ops - virtual PCI device operations11 * enum virtio_pcidev_ops - virtual PCI device operations
12 * @VIRTIO_PCIDEV_OP_RESERVED: reserved to catch errors
12 * @VIRTIO_PCIDEV_OP_CFG_READ: read config space, size is 1, 2, 4 or 8;13 * @VIRTIO_PCIDEV_OP_CFG_READ: read config space, size is 1, 2, 4 or 8;
13 * the @data field should be filled in by the device (in little endian).14 * the @data field should be filled in by the device (in little endian).
14 * @VIRTIO_PCIDEV_OP_CFG_WRITE: write config space, size is 1, 2, 4 or 8;15 * @VIRTIO_PCIDEV_OP_CFG_WRITE: write config space, size is 1, 2, 4 or 8;
15 * the @data field contains the data to write (in little endian).16 * the @data field contains the data to write (in little endian).
16 * @VIRTIO_PCIDEV_OP_BAR_READ: read BAR mem/pio, size can be variable;17 * @VIRTIO_PCIDEV_OP_MMIO_READ: read BAR mem/pio, size can be variable;
17 * the @data field should be filled in by the device (in little endian).18 * the @data field should be filled in by the device (in little endian).
18 * @VIRTIO_PCIDEV_OP_BAR_WRITE: write BAR mem/pio, size can be variable;19 * @VIRTIO_PCIDEV_OP_MMIO_WRITE: write BAR mem/pio, size can be variable;
19 * the @data field contains the data to write (in little endian).20 * the @data field contains the data to write (in little endian).
20 * @VIRTIO_PCIDEV_OP_MMIO_MEMSET: memset MMIO, size is variable but21 * @VIRTIO_PCIDEV_OP_MMIO_MEMSET: memset MMIO, size is variable but
21 * the @data field only has one byte (unlike @VIRTIO_PCIDEV_OP_MMIO_WRITE)22 * the @data field only has one byte (unlike @VIRTIO_PCIDEV_OP_MMIO_WRITE)