From patchwork Wed Mar 30 14:19:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8697111 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 1CD5E9F44D for ; Wed, 30 Mar 2016 14:19:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 352A920384 for ; Wed, 30 Mar 2016 14:19:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 629F420383 for ; Wed, 30 Mar 2016 14:19:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84BCA6E821; Wed, 30 Mar 2016 14:19:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com [IPv6:2a00:1450:400c:c09::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 529A46E81E for ; Wed, 30 Mar 2016 14:19:47 +0000 (UTC) Received: by mail-wm0-x236.google.com with SMTP id 20so73522830wmh.1 for ; Wed, 30 Mar 2016 07:19:47 -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=NPQdke0CfjXetAHrTchcOvAdSe7jor1SgukJ/+ox61ocwzehA153sWB00unEpI7fK1 xjQ74BvJzHvSJQBT1Yrvwc02nWk1duCzSWQ/8z9UbFuL1eLNmIQZLYKp12VDmQaVc7fZ xMPhUTSK1BhwNroJrPSutn65PUstSlcwn8YkA= 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=Q6wsvZnr0f6Lq00E+ZG+eSCMb4u+DtEQHIEOCbG4ObuW4dr8XizcsbYBXRiYQ7WcNP ivz6tqw4GWiATWdCIPJ6uF9u2ujlSwgnIyXx9px0PpLBXlfTUzHMU0/pPkcUJxW6AQCf p+NnKEbo5xQyLOBj2NGgZ5IKI5ISp+VLPbS+QOv2pkFgRiNeU2y1GnQinEl/CGYeN4ck kcCJbxjv/BdxXW13NT85jy9CEYAjklr9vbUlxDUxaC6GaFXtKX7UI9/NWvHqTR4lvylZ PGlPubxmjMD1rWITT32NRamju/dmzA0z0vwWV0qQO2bmBl+xwMmZx9aw1WTMQq/fVpc+ 7cKw== X-Gm-Message-State: AD7BkJJwXwPH8+7UanQxOrtoa8hTHips5EhdYGVbQMZstFj8XKEENtzbgjdU43LcDYRKjg== X-Received: by 10.28.179.7 with SMTP id c7mr11061525wmf.46.1459347584903; Wed, 30 Mar 2016 07:19:44 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id u16sm4728205wmd.5.2016.03.30.07.19.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 07:19:44 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/3] drm: Make drm.h uapi header safe for C++ Date: Wed, 30 Mar 2016 16:19:42 +0200 Message-Id: <1459347584-30566-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 */ };