From patchwork Wed Mar 30 13:47:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8696391 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A616E9F3D1 for ; Wed, 30 Mar 2016 13:47:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7D852037F for ; Wed, 30 Mar 2016 13:47:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 005322037E for ; Wed, 30 Mar 2016 13:47:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B36D96E804; Wed, 30 Mar 2016 13:47:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF9486E804 for ; Wed, 30 Mar 2016 13:47:36 +0000 (UTC) Received: by mail-wm0-x232.google.com with SMTP id 191so90531598wmq.0 for ; Wed, 30 Mar 2016 06:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=eCDJKiSY4Xp2LQa4X8P9Cm9Lr2KTOJHcm+J5Tecqlrg=; b=GWiwDywCuQaGhrIHxfqQdobNloE5qDtQmwhIiueooEzWDjw+dQQr3CuOcKNeiAF+K+ ylIEW6gEM1JgUlq90rEXHsfsQxMeJehSUu1SkvLv9CuCVL4GHN+Bg07LpPlchhnutviV XBQL0FQpM4A2/rsTdmOsYA9+Re1XCTGyEc+eo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eCDJKiSY4Xp2LQa4X8P9Cm9Lr2KTOJHcm+J5Tecqlrg=; b=fOrfRxwuE2VjraaNvlTZ+O5C2rH+9ed6jGfbGY0BGqhWGLIa2lBAcX2Ql+N0BuLU6e TnfjdD7BWX9imWRg2e7Bnve7DSd4wktLtrIoEC4qczKaLnj0HEcsb3EKoMp7gc9FWlm1 HIwv5DunvPW6ImnuqISsWxSPv0Pb1A4FAdGF0SaNvlrTyH4gB8IHdd9fYxh0dc9LbzG2 XXEYDCib8oBkPI0OcNd+xosJEyEmdGxrnEn+LFYwIbs9IqEZ0liKSw1/3JfBOmx0hr9f iNAF47qst1fOc5rI9BikvuxlwI2L1JHSEEyp/3R5WX5YWtIH2oWjyWRnNAg0Q++6KMke U8Ew== X-Gm-Message-State: AD7BkJJWYsk/QntvlOISLG/CKCzh9U8eMVLBzaZnJyQFlhBcSYJCTRRyNzL9CvN5duzkRA== X-Received: by 10.194.58.169 with SMTP id s9mr9799381wjq.52.1459345654363; Wed, 30 Mar 2016 06:47:34 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id u202sm19916035wmd.24.2016.03.30.06.47.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 06:47:33 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm: Make drm.h uapi header safe for C++ Date: Wed, 30 Mar 2016 15:47:34 +0200 Message-Id: <1459345654-30786-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 Cc: Daniel Vetter , Emil Velikov , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP virtual is a protected keyword in C++ and can't be used at all. Ugh. This aligns the kernel versions of the drm headers with the ones in libdrm. Cc: Emil Velikov Signed-off-by: Daniel Vetter --- include/uapi/drm/drm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index a0ebfe7c9a28..d299c7749091 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -373,7 +373,11 @@ struct drm_buf_pub { */ struct drm_buf_map { int count; /**< Length of the buffer list */ +#ifdef __cplusplus + void *virt; +#else void __user *virtual; /**< Mmap'd area in user-virtual */ +#endif struct drm_buf_pub __user *list; /**< Buffer information */ };