diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-09-09 15:03:30 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2015-09-09 15:03:30 -0400 |
commit | ddab2c0eaf57b2de0b2516a477e3ce0f7554509b (patch) | |
tree | d1eb57b89a4da9bac367b58739805d3e239f51a7 /tools | |
parent | 997e120843e82609c8d99a9d5714e6cf91e14cbe (diff) |
tools/virtio: fix build after 4.2 changes
more stubs, mostly
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/virtio/asm/barrier.h | 2 | ||||
-rw-r--r-- | tools/virtio/linux/export.h | 3 | ||||
-rw-r--r-- | tools/virtio/linux/kernel.h | 8 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tools/virtio/asm/barrier.h b/tools/virtio/asm/barrier.h index aff61e13306c..26b7926bda88 100644 --- a/tools/virtio/asm/barrier.h +++ b/tools/virtio/asm/barrier.h | |||
@@ -3,6 +3,8 @@ | |||
3 | #define mb() __sync_synchronize() | 3 | #define mb() __sync_synchronize() |
4 | 4 | ||
5 | #define smp_mb() mb() | 5 | #define smp_mb() mb() |
6 | # define dma_rmb() barrier() | ||
7 | # define dma_wmb() barrier() | ||
6 | # define smp_rmb() barrier() | 8 | # define smp_rmb() barrier() |
7 | # define smp_wmb() barrier() | 9 | # define smp_wmb() barrier() |
8 | /* Weak barriers should be used. If not - it's a bug */ | 10 | /* Weak barriers should be used. If not - it's a bug */ |
diff --git a/tools/virtio/linux/export.h b/tools/virtio/linux/export.h new file mode 100644 index 000000000000..416875e29254 --- /dev/null +++ b/tools/virtio/linux/export.h | |||
@@ -0,0 +1,3 @@ | |||
1 | #define EXPORT_SYMBOL_GPL(sym) extern typeof(sym) sym | ||
2 | #define EXPORT_SYMBOL(sym) extern typeof(sym) sym | ||
3 | |||
diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h index 1e8ce6979c1e..0a3da64638ce 100644 --- a/tools/virtio/linux/kernel.h +++ b/tools/virtio/linux/kernel.h | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | typedef unsigned long long dma_addr_t; | 23 | typedef unsigned long long dma_addr_t; |
24 | typedef size_t __kernel_size_t; | 24 | typedef size_t __kernel_size_t; |
25 | typedef unsigned int __wsum; | ||
25 | 26 | ||
26 | struct page { | 27 | struct page { |
27 | unsigned long long dummy; | 28 | unsigned long long dummy; |
@@ -47,6 +48,13 @@ static inline void *kmalloc(size_t s, gfp_t gfp) | |||
47 | return __kmalloc_fake; | 48 | return __kmalloc_fake; |
48 | return malloc(s); | 49 | return malloc(s); |
49 | } | 50 | } |
51 | static inline void *kzalloc(size_t s, gfp_t gfp) | ||
52 | { | ||
53 | void *p = kmalloc(s, gfp); | ||
54 | |||
55 | memset(p, 0, s); | ||
56 | return p; | ||
57 | } | ||
50 | 58 | ||
51 | static inline void kfree(void *p) | 59 | static inline void kfree(void *p) |
52 | { | 60 | { |