From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Howells Subject: [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members Date: Wed, 05 Sep 2018 16:54:40 +0100 Message-ID: <153616288089.23468.4502511671693917281.stgit@warthog.procyon.org.uk> References: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-api@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: David Airlie , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, dhowells@redhat.com, freedreno@lists.freedesktop.org List-Id: linux-arm-msm@vger.kernel.org VGhlIGk4MTAgYW5kIG1zbSBkcm0gZHJpdmVycyB1c2UgQysrIGtleXdvcmRzIGFzIHN0cnVjdHVy YWwgbWVtYmVycy4gIEZpeAp0aGlzIGJ5IGluc2VydGluZyBhbiBhbm9ueW1vdXMgdW5pb24gdGhh dCBwcm92aWRlcyBhbiBhbHRlcm5hdGl2ZSBuYW1lIGFuZAp0aGVuIGhpZGUgdGhlIHJlc2VydmVk IG5hbWUgaW4gQysrLgoKU2lnbmVkLW9mZi1ieTogRGF2aWQgSG93ZWxscyA8ZGhvd2VsbHNAcmVk aGF0LmNvbT4KY2M6IFJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbT4KY2M6IERhdmlkIEFp cmxpZSA8YWlybGllZEBsaW51eC5pZT4KY2M6IGxpbnV4LWFybS1tc21Admdlci5rZXJuZWwub3Jn CmNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmNjOiBmcmVlZHJlbm9AbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCi0tLQoKIGluY2x1ZGUvdWFwaS9kcm0vaTgxMF9kcm0uaCB8ICAgIDcg KysrKysrLQogaW5jbHVkZS91YXBpL2RybS9tc21fZHJtLmggIHwgICAgNyArKysrKystCiAyIGZp bGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvaW5jbHVkZS91YXBpL2RybS9pODEwX2RybS5oIGIvaW5jbHVkZS91YXBpL2RybS9pODEwX2Ry bS5oCmluZGV4IGQyODVkNWU3MmU2YS4uNjE3ZDc5ZWMzZmM1IDEwMDY0NAotLS0gYS9pbmNsdWRl L3VhcGkvZHJtL2k4MTBfZHJtLmgKKysrIGIvaW5jbHVkZS91YXBpL2RybS9pODEwX2RybS5oCkBA IC0yNjYsNyArMjY2LDEyIEBAIHR5cGVkZWYgc3RydWN0IF9kcm1faTgxMF9jb3B5X3QgewogI2Rl ZmluZSBQUl9NQVNLICAgICAgICAgICAgICAoMHg3PDwxOCkKIAogdHlwZWRlZiBzdHJ1Y3QgZHJt X2k4MTBfZG1hIHsKLQl2b2lkICp2aXJ0dWFsOworCXVuaW9uIHsKKyNpZm5kZWYgX19jcGx1c3Bs dXMKKwkJdm9pZCAqdmlydHVhbDsKKyNlbmRpZgorCQl2b2lkICpfdmlydHVhbDsKKwl9OwogCWlu dCByZXF1ZXN0X2lkeDsKIAlpbnQgcmVxdWVzdF9zaXplOwogCWludCBncmFudGVkOwpkaWZmIC0t Z2l0IGEvaW5jbHVkZS91YXBpL2RybS9tc21fZHJtLmggYi9pbmNsdWRlL3VhcGkvZHJtL21zbV9k cm0uaAppbmRleCBjMDZkMGE1YmRkODAuLmU5OWJhYjcyZDU4YyAxMDA2NDQKLS0tIGEvaW5jbHVk ZS91YXBpL2RybS9tc21fZHJtLmgKKysrIGIvaW5jbHVkZS91YXBpL2RybS9tc21fZHJtLmgKQEAg LTE0OCw3ICsxNDgsMTIgQEAgc3RydWN0IGRybV9tc21fZ2VtX2NwdV9maW5pIHsKICAqLwogc3Ry dWN0IGRybV9tc21fZ2VtX3N1Ym1pdF9yZWxvYyB7CiAJX191MzIgc3VibWl0X29mZnNldDsgIC8q IGluLCBvZmZzZXQgZnJvbSBzdWJtaXRfYm8gKi8KLQlfX3UzMiBvcjsgICAgICAgICAgICAgLyog aW4sIHZhbHVlIE9SJ2Qgd2l0aCByZXN1bHQgKi8KKwl1bmlvbiB7CisjaWZuZGVmIF9fY3BsdXNw bHVzCisJCV9fdTMyIG9yOwkvKiBpbiwgdmFsdWUgT1InZCB3aXRoIHJlc3VsdCAqLworI2VuZGlm CisJCV9fdTMyIF9vcjsJLyogaW4sIHZhbHVlIE9SJ2Qgd2l0aCByZXN1bHQgKi8KKwl9OwogCV9f czMyIHNoaWZ0OyAgICAgICAgICAvKiBpbiwgYW1vdW50IG9mIGxlZnQgc2hpZnQgKGNhbiBiZSBu ZWdhdGl2ZSkgKi8KIAlfX3UzMiByZWxvY19pZHg7ICAgICAgLyogaW4sIGluZGV4IG9mIHJlbG9j X2JvIGJ1ZmZlciAqLwogCV9fdTY0IHJlbG9jX29mZnNldDsgICAvKiBpbiwgb2Zmc2V0IGZyb20g c3RhcnQgb2YgcmVsb2NfYm8gKi8KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04BD8C43334 for ; Wed, 5 Sep 2018 15:54:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF3FF2075E for ; Wed, 5 Sep 2018 15:54:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF3FF2075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727676AbeIEUZb (ORCPT ); Wed, 5 Sep 2018 16:25:31 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36964 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726189AbeIEUZa (ORCPT ); Wed, 5 Sep 2018 16:25:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75E2740241C3; Wed, 5 Sep 2018 15:54:42 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-123-84.rdu2.redhat.com [10.10.123.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 604FA202706C; Wed, 5 Sep 2018 15:54:41 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members From: David Howells To: linux-api@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: Rob Clark , David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dhowells@redhat.com Date: Wed, 05 Sep 2018 16:54:40 +0100 Message-ID: <153616288089.23468.4502511671693917281.stgit@warthog.procyon.org.uk> In-Reply-To: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> References: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 05 Sep 2018 15:54:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 05 Sep 2018 15:54:42 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dhowells@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The i810 and msm drm drivers use C++ keywords as structural members. Fix this by inserting an anonymous union that provides an alternative name and then hide the reserved name in C++. Signed-off-by: David Howells cc: Rob Clark cc: David Airlie cc: linux-arm-msm@vger.kernel.org cc: dri-devel@lists.freedesktop.org cc: freedreno@lists.freedesktop.org --- include/uapi/drm/i810_drm.h | 7 ++++++- include/uapi/drm/msm_drm.h | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/uapi/drm/i810_drm.h b/include/uapi/drm/i810_drm.h index d285d5e72e6a..617d79ec3fc5 100644 --- a/include/uapi/drm/i810_drm.h +++ b/include/uapi/drm/i810_drm.h @@ -266,7 +266,12 @@ typedef struct _drm_i810_copy_t { #define PR_MASK (0x7<<18) typedef struct drm_i810_dma { - void *virtual; + union { +#ifndef __cplusplus + void *virtual; +#endif + void *_virtual; + }; int request_idx; int request_size; int granted; diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index c06d0a5bdd80..e99bab72d58c 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -148,7 +148,12 @@ struct drm_msm_gem_cpu_fini { */ struct drm_msm_gem_submit_reloc { __u32 submit_offset; /* in, offset from submit_bo */ - __u32 or; /* in, value OR'd with result */ + union { +#ifndef __cplusplus + __u32 or; /* in, value OR'd with result */ +#endif + __u32 _or; /* in, value OR'd with result */ + }; __s32 shift; /* in, amount of left shift (can be negative) */ __u32 reloc_idx; /* in, index of reloc_bo buffer */ __u64 reloc_offset; /* in, offset from start of reloc_bo */