diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-14 14:12:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-14 14:12:59 -0700 |
| commit | 35c99ffa20edd3c24be352d28a63cd3a23121282 (patch) | |
| tree | 4a844d58d3a5648025f48821198ef04f643a857e /tools | |
| parent | 814137768b5a9504f758aa760e7b1ac355539783 (diff) | |
| parent | 050f4c4d2fbbd8217d94dc21051cc597d2a6848b (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
- enable packed ring support for s390
- several fixes
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio/s390: enable packed ring
virtio/s390: DMA support for virtio-ccw
virtio/s390: use vring_create_virtqueue
virtio/virtio_ring: do some comment fixes
vhost-scsi: remove incorrect memory barrier
tools/virtio/ringtest: Remove bogus definition of BUG_ON()
virtio_ring: Fix potential mem leak in virtqueue_add_indirect_packed
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtio/ringtest/ptr_ring.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/virtio/ringtest/ptr_ring.c b/tools/virtio/ringtest/ptr_ring.c index 2d566fbd236b..c9b26335f891 100644 --- a/tools/virtio/ringtest/ptr_ring.c +++ b/tools/virtio/ringtest/ptr_ring.c @@ -18,7 +18,6 @@ #define ALIGN(x, a) (((x) + (a) - 1) / (a) * (a)) #define SIZE_MAX (~(size_t)0) #define KMALLOC_MAX_SIZE SIZE_MAX -#define BUG_ON(x) assert(x) typedef pthread_spinlock_t spinlock_t; |