Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753714AbdLSTmi (ORCPT ); Tue, 19 Dec 2017 14:42:38 -0500 Received: from mga01.intel.com ([192.55.52.88]:17647 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753233AbdLSTg6 (ORCPT ); Tue, 19 Dec 2017 14:36:58 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,428,1508828400"; d="scan'208";a="4018617" From: Dongwon Kim To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org, mateuszx.potrola@intel.com, dongwon.kim@intel.com Subject: [RFC PATCH 40/60] hyper_dmabuf: do not use 'private' as field name Date: Tue, 19 Dec 2017 11:29:56 -0800 Message-Id: <1513711816-2618-40-git-send-email-dongwon.kim@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513711816-2618-1-git-send-email-dongwon.kim@intel.com> References: <1513711816-2618-1-git-send-email-dongwon.kim@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1655 Lines: 46 From: Mateusz Polrola 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 --- 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