Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751927AbdHFRYF (ORCPT ); Sun, 6 Aug 2017 13:24:05 -0400 Received: from mail.kapsi.fi ([91.232.154.25]:51731 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751583AbdHFRYD (ORCPT ); Sun, 6 Aug 2017 13:24:03 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Cc: Mikko Rapeli , Boris Ostrovsky , Juergen Gross , xen-devel@lists.xenproject.org, Andrew Morton , Masahiro Yamada Subject: [PATCH v06 27/36] uapi xen/gntdev.h: include xen/privcmd.h and define grant_ref_t Date: Sun, 6 Aug 2017 18:44:18 +0200 Message-Id: <20170806164428.2273-28-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170806164428.2273-1-mikko.rapeli@iki.fi> References: <20170806164428.2273-1-mikko.rapeli@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2003:6c:cd28:d400:219:d2ff:fe03:c7a9 X-SA-Exim-Mail-From: mikko.rapeli@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1830 Lines: 62 Both are needed to compile in userspace. Fixes these userspace compile errors: xen/gntdev.h:151:4: error: unknown type name ‘grant_ref_t’ grant_ref_t ref; ^ xen/gntdev.h:153:4: error: unknown type name ‘domid_t’ domid_t domid; ^ Signed-off-by: Mikko Rapeli Cc: Boris Ostrovsky Cc: Juergen Gross Cc: xen-devel@lists.xenproject.org --- include/uapi/xen/gntdev.h | 6 ++++++ include/xen/interface/grant_table.h | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/uapi/xen/gntdev.h b/include/uapi/xen/gntdev.h index d0661977667e..f208706b07c9 100644 --- a/include/uapi/xen/gntdev.h +++ b/include/uapi/xen/gntdev.h @@ -34,6 +34,12 @@ #define __LINUX_PUBLIC_GNTDEV_H__ #include +#include + +/* + * Reference to a grant entry in a specified domain's grant table. + */ +typedef __u32 grant_ref_t; struct ioctl_gntdev_grant_ref { /* The domain ID of the grant to be mapped. */ diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h index 7fb7112d667c..29b3724aec2c 100644 --- a/include/xen/interface/grant_table.h +++ b/include/xen/interface/grant_table.h @@ -29,6 +29,7 @@ #define __XEN_PUBLIC_GRANT_TABLE_H__ #include +#include /* for grant_ref_t */ /*********************************** * GRANT TABLE REPRESENTATION @@ -85,11 +86,6 @@ */ /* - * Reference to a grant entry in a specified domain's grant table. - */ -typedef uint32_t grant_ref_t; - -/* * A grant table comprises a packed array of grant entries in one or more * page frames shared between Xen and a guest. * [XEN]: This field is written by Xen and read by the sharing guest. -- 2.13.3