diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 09:28:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 09:28:20 -0700 |
commit | 00ade1f553e3b947cd26228392ee47d6f0f550e1 (patch) | |
tree | 103650aae51d14e271542e068b7c89fec0cf4387 /tools/virtio/linux/kernel.h | |
parent | 3ae839454e77cdc87d499a4bfd0932dec5763b55 (diff) | |
parent | ad2aa04218de9bd734d593adb0ac59854ec0cb68 (diff) | |
download | op-kernel-dev-00ade1f553e3b947cd26228392ee47d6f0f550e1.zip op-kernel-dev-00ade1f553e3b947cd26228392ee47d6f0f550e1.tar.gz |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes and cleanups from Michael Tsirkin:
"This fixes the virtio-test tool, and improves the error handling for
virtio-ccw"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio/s390: handle failures of READ_VQ_CONF ccw
tools/virtio: propagate V=X to kernel build
vhost: move features to core
tools/virtio: fix build after 4.2 changes
Diffstat (limited to 'tools/virtio/linux/kernel.h')
-rw-r--r-- | tools/virtio/linux/kernel.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h index 1e8ce69..0a3da64 100644 --- a/tools/virtio/linux/kernel.h +++ b/tools/virtio/linux/kernel.h @@ -22,6 +22,7 @@ typedef unsigned long long dma_addr_t; typedef size_t __kernel_size_t; +typedef unsigned int __wsum; struct page { unsigned long long dummy; @@ -47,6 +48,13 @@ static inline void *kmalloc(size_t s, gfp_t gfp) return __kmalloc_fake; return malloc(s); } +static inline void *kzalloc(size_t s, gfp_t gfp) +{ + void *p = kmalloc(s, gfp); + + memset(p, 0, s); + return p; +} static inline void kfree(void *p) { |