linux-kernel - Re: linux-next: build failure after merge of the nvdimm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <616554090.39241752.1562316343431.JavaMail.zimbra@redhat.com>
Date:   Fri, 5 Jul 2019 04:45:43 -0400 (EDT)
From:   Pankaj Gupta <pagupta@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Dan Williams <dan.j.williams@...el.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Yuval Shaia <yuval.shaia@...cle.com>,
        "Michael S. Tsirkin" <mst@...hat.com>,
        Jakub Staron <jstaron@...gle.com>,
        Cornelia Huck <cohuck@...hat.com>
Subject: Re: linux-next: build failure after merge of the nvdimm tree


Hi Stephen,
> 
> Hi all,
> 
> After merging the nvdimm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from :32:
> ./usr/include/linux/virtio_pmem.h:19:2: error: unknown type name 'uint64_t'
>   uint64_t start;
>   ^~~~~~~~
> ./usr/include/linux/virtio_pmem.h:20:2: error: unknown type name 'uint64_t'
>   uint64_t size;
>   ^~~~~~~~
> 
> Caused by commit
> 
>   403b7f973855 ("virtio-pmem: Add virtio pmem driver")
> 
> I have used the nvdimm tree from next-20190704 for today.

Thank you for the report.

Can we apply below patch [1] on top to complete linux-next build for today.
I have tested this locally.

Thanks,
Pankaj

========

[1]

diff --git a/drivers/nvdimm/virtio_pmem.h b/drivers/nvdimm/virtio_pmem.h
index 998efbc7660c..dbc12dfe8067 100644
--- a/drivers/nvdimm/virtio_pmem.h
+++ b/drivers/nvdimm/virtio_pmem.h
@@ -46,8 +46,8 @@ struct virtio_pmem {
        spinlock_t pmem_lock;
 
        /* Memory region information */
-       uint64_t start;
-       uint64_t size;
+       u64 start;
+       u64 size;
 };
 
 void virtio_pmem_host_ack(struct virtqueue *vq);
diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h
index 379861f114f1..efcd72f2d20d 100644
--- a/include/uapi/linux/virtio_pmem.h
+++ b/include/uapi/linux/virtio_pmem.h
@@ -11,25 +11,24 @@
 #define _UAPI_LINUX_VIRTIO_PMEM_H
 
 #include <linux/types.h>
-#include <linux/virtio_types.h>
 #include <linux/virtio_ids.h>
 #include <linux/virtio_config.h>
 
 struct virtio_pmem_config {
-       uint64_t start;
-       uint64_t size;
+       __u64 start;
+       __u64 size;
 };
 
 #define VIRTIO_PMEM_REQ_TYPE_FLUSH      0
 
 struct virtio_pmem_resp {
        /* Host return status corresponding to flush request */
-       __virtio32 ret;
+       __u32 ret;
 };
 
 struct virtio_pmem_req {
        /* command type */
-       __virtio32 type;
+       __u32 type;
 };