Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752091AbdHFRZS (ORCPT ); Sun, 6 Aug 2017 13:25:18 -0400 Received: from mail.kapsi.fi ([91.232.154.25]:55707 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752031AbdHFRZB (ORCPT ); Sun, 6 Aug 2017 13:25:01 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Cc: Mikko Rapeli , Paul Durrant , David Vrabel , Stefano Stabellini , Russell King , Boris Ostrovsky , Juergen Gross , xen-devel@lists.xenproject.org Subject: [PATCH v06 26/36] uapi xen/privcmd.h: fix compilation in userspace Date: Sun, 6 Aug 2017 18:44:17 +0200 Message-Id: <20170806164428.2273-27-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: 1829 Lines: 60 xen/interface/xen.h is not exported from kernel headers so remove the dependency and provide needed defines for domid_t and xen_pfn_t if they are not already defined by some other e.g. Xen specific headers. Suggested by Andrew Cooper on lkml message <5569F9C9.8000607@citrix.com>. The ifdef for ARM is ugly but did not find better solutions for it. Then use __kernel_size_t instead of size_t since that is available in uapi headers in user space. Fixes userspace compilation errors: xen/privcmd.h:38:31: fatal error: xen/interface/xen.h: No such file or directory xen/privcmd.h:92:2: error: unknown type name ‘size_t’ Signed-off-by: Mikko Rapeli Cc: Paul Durrant Cc: David Vrabel Cc: Stefano Stabellini Cc: Russell King --- include/uapi/xen/privcmd.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/uapi/xen/privcmd.h b/include/uapi/xen/privcmd.h index 63ee95c9dabb..565f3003741d 100644 --- a/include/uapi/xen/privcmd.h +++ b/include/uapi/xen/privcmd.h @@ -35,7 +35,17 @@ #include #include -#include + +/* Defined by include/xen/interface/xen.h, but it is not part of Linux uapi */ +#ifndef __XEN_PUBLIC_XEN_H__ +typedef __u16 domid_t; + +#if (defined __ARMEL__ || defined __ARMEB__) +typedef __u64 xen_pfn_t; +#else +typedef unsigned long xen_pfn_t; +#endif /* (defined __ARMEL__ || defined __ARMEB__) */ +#endif /* __XEN_PUBLIC_XEN_H__ */ struct privcmd_hypercall { __u64 op; @@ -79,7 +89,7 @@ struct privcmd_mmapbatch_v2 { struct privcmd_dm_op_buf { void __user *uptr; - size_t size; + __kernel_size_t size; }; struct privcmd_dm_op { -- 2.13.3