[ Upstream commit d650f830f3 ]

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 <sgarzare@redhat.com>
Message-Id: <20220705072249.7867-1-sgarzare@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Stefano Garzarella 2022-07-05 09:22:49 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель 80f2a24622
Коммит 572ee5086e
2 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -30,7 +30,6 @@
#define READ 0 #define READ 0
#define WRITE 1 #define WRITE 1
typedef unsigned long long phys_addr_t;
typedef unsigned long long dma_addr_t; typedef unsigned long long dma_addr_t;
typedef size_t __kernel_size_t; typedef size_t __kernel_size_t;
typedef unsigned int __wsum; 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
#endif #endif
#define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__) #define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
#define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__) #define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
#define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
#define min(x, y) ({ \ #define min(x, y) ({ \
typeof(x) _min1 = (x); \ typeof(x) _min1 = (x); \

Просмотреть файл

@ -1 +1,2 @@
#include <limits.h>
#include "../../../include/linux/vringh.h" #include "../../../include/linux/vringh.h"