From patchwork Wed Mar 30 15:12:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8698281 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 2F96C9F3D1 for ; Wed, 30 Mar 2016 15:12:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55F2620279 for ; Wed, 30 Mar 2016 15:12:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2D79520149 for ; Wed, 30 Mar 2016 15:12:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B67F46E846; Wed, 30 Mar 2016 15:12:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B1956E846 for ; Wed, 30 Mar 2016 15:12:35 +0000 (UTC) Received: by mail-wm0-x230.google.com with SMTP id 20so75737197wmh.1 for ; Wed, 30 Mar 2016 08:12:35 -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:in-reply-to:references; bh=lFSvvu2ysqyaxKbDsaTP3y17hr5gR76/T3ylMfm4jbs=; b=cainSMy+lASKUf/3FxHXbjtxmwykMNhpOSHZl6RiS7gvR5VYbinEnfmvfa9O7CK48m 69msV24GpSJC7hU+YDRkRxCl75bz9KkXQ356APUTomaFf4L2gxu06nR83bcXlux+EYSb IaMIB6d1Y6ltJ2kCR4nA6Cu3KoA1rTwRwud/4= 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:in-reply-to :references; bh=lFSvvu2ysqyaxKbDsaTP3y17hr5gR76/T3ylMfm4jbs=; b=YSvhmgWJzex/DKD3Cb3D4xgkseiws12Xwgm76jmUNMN/VrwO9k15+v06sdXIdwRKxw anMW+6WZEyC8zxIX0vOcT5p85lHYLk9dYkO57nsRAE3SaPybRf/whZw3SfgMOaSIE0RV 5ZPQnVDGn5+eOJAkNGLDkQytRDa0YoorwdLSumWWDjZbjKbYla1rut+TbSzIJukFoAeP NEuaumtyIb4t+7RK4r0CgxDRnObhlIqWJ8a4Lb/XPtuZyxRdEai8wVU57MQwQ2CYHoGu 8xiWbsQyVNVycen8ZQ4Tn+WU5r+Hs0wHdNR2QPn6pWy0zjyUHh0NjKCx4texZhhcIFLG hbJQ== X-Gm-Message-State: AD7BkJIJCA46DJSoTI5Sb8zl41brfZOEh/omlUEy3a6yKlj89vcL0L5tcGCjGsDYf7zX2w== X-Received: by 10.28.51.15 with SMTP id z15mr25142333wmz.32.1459350753237; Wed, 30 Mar 2016 08:12:33 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id r8sm4406912wjz.34.2016.03.30.08.12.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 08:12:32 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm: Make drm.h uapi header safe for C++ Date: Wed, 30 Mar 2016 17:12:33 +0200 Message-Id: <1459350753-18320-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> 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. v2: Also annote with __user, as request by Emil&Ilia. Cc: Ilia Mirkin Cc: Emil Velikov Signed-off-by: Daniel Vetter Reviewed-by: Emil Velikov --- 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..7d42d105f32a 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 __user *virt; +#else void __user *virtual; /**< Mmap'd area in user-virtual */ +#endif struct drm_buf_pub __user *list; /**< Buffer information */ };