Re: [PATCH] tools/virtio: drop phys_addr_t typedef

[Jason Wang]

On Mon, Apr 11, 2022 at 9:39 AM Peng Fan (OSS) <peng.fan@xxxxxxxxxxx> wrote:
>
> From: Peng Fan <peng.fan@xxxxxxx>
>
> With commit 884ee1e585ca ("tools/include: Add phys_addr_t to types.h"),
>
> When building virtio tools, there is a type conficting error:
>
> "
> ./linux/kernel.h:32:28: error: conflicting types for ‘phys_addr_t’
>    32 | typedef unsigned long long phys_addr_t;
>       |                            ^~~~~~~~~~~
> In file included from /usr/include/linux/virtio_blk.h:28,
>                  from virtio-ivshmem-block.c:29:
> ../include/linux/types.h:69:13: note: previous declaration of ‘phys_addr_t’ was here
>    69 | typedef u32 phys_addr_t;
>       |             ^~~~~~~~~~~
> "
>
> Let's drop the typedef in tools/virtio/linux/kernel.h
>
> Signed-off-by: Peng Fan <peng.fan@xxxxxxx>

Acked-by: Jason Wang <jasowang@xxxxxxxxxx>

> ---
>  tools/virtio/linux/kernel.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h
> index 0b493542e61a..1d3248e3f270 100644
> --- a/tools/virtio/linux/kernel.h
> +++ b/tools/virtio/linux/kernel.h
> @@ -29,7 +29,6 @@
>  #define READ                    0
>  #define WRITE                   1
>
> -typedef unsigned long long phys_addr_t;
>  typedef unsigned long long dma_addr_t;
>  typedef size_t __kernel_size_t;
>  typedef unsigned int __wsum;
> --
> 2.25.1
>