[Xen-devel] [RFC PATCH 40/60] hyper_dmabuf: do not use 'private' as field name

[Dongwon Kim <dongwon.kim@xxxxxxxxx>]

From: Mateusz Polrola <mateuszx.potrola@xxxxxxxxx>

Using a word, 'private' is not recommended because of conflict
with language keyword when compiling with C++.
So changing those to 'priv'.

Signed-off-by: Dongwon Kim <dongwon.kim@xxxxxxxxx>
---
 drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c | 8 ++++----
 include/uapi/xen/hyper_dmabuf.h               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c 
b/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c
index 2ff2c145..9d05d66 100644
--- a/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c
+++ b/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c
@@ -257,10 +257,10 @@ static int hyper_dmabuf_export_remote_ioctl(struct file 
*filp, void *data)
        }
 
        /* driver/application specific private info, max 4x4 bytes */
-       operands[8] = export_remote_attr->private[0];
-       operands[9] = export_remote_attr->private[1];
-       operands[10] = export_remote_attr->private[2];
-       operands[11] = export_remote_attr->private[3];
+       operands[8] = export_remote_attr->priv[0];
+       operands[9] = export_remote_attr->priv[1];
+       operands[10] = export_remote_attr->priv[2];
+       operands[11] = export_remote_attr->priv[3];
 
        req = kcalloc(1, sizeof(*req), GFP_KERNEL);
 
diff --git a/include/uapi/xen/hyper_dmabuf.h b/include/uapi/xen/hyper_dmabuf.h
index bee0f86..a2d22d0 100644
--- a/include/uapi/xen/hyper_dmabuf.h
+++ b/include/uapi/xen/hyper_dmabuf.h
@@ -56,7 +56,7 @@ struct ioctl_hyper_dmabuf_export_remote {
        int remote_domain;
        /* exported dma buf id */
        hyper_dmabuf_id_t hid;
-       int private[4];
+       int priv[4];
 };
 
 #define IOCTL_HYPER_DMABUF_EXPORT_FD \
-- 
2.7.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel