Skip to content

Commit 572ee50

Browse files
stefano-garzarellagregkh
authored andcommitted
tools/virtio: fix build
[ Upstream commit d650f83 ] Fix the build caused by the following changes: - phys_addr_t is now defined in tools/include/linux/types.h - dev_warn_once() is used in drivers/virtio/virtio_ring.c - linux/uio.h included by vringh.h use INT_MAX defined in limits.h Signed-off-by: Stefano Garzarella <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-by: Eugenio Pérez <[email protected]> Signed-off-by: Peng Fan <[email protected]> Acked-by: Jason Wang <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 80f2a24 commit 572ee50

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

tools/virtio/linux/kernel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#define READ 0
3131
#define WRITE 1
3232

33-
typedef unsigned long long phys_addr_t;
3433
typedef unsigned long long dma_addr_t;
3534
typedef size_t __kernel_size_t;
3635
typedef unsigned int __wsum;
@@ -137,6 +136,7 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t
137136
#endif
138137
#define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
139138
#define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
139+
#define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
140140

141141
#define min(x, y) ({ \
142142
typeof(x) _min1 = (x); \

tools/virtio/linux/vringh.h

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include <limits.h>
12
#include "../../../include/linux/vringh.h"

0 commit comments

Comments
 (0)